no message

controllers/company_seller.go

@@ -5296,3 +5296,52 @@ func (this *CompanySellerController) ShareCheckList2() {
 		List: list,
 	}
 }
+
+// RaiServeSellerList
+// @Title 获取权益服务组销售列表
+// @Description 获取权益服务组销售列表 接口
+// @Success 200 {object} company.DepartmentGroupSellersResp
+// @router /seller/rai_serve/list [get]
+func (this *CompanySellerController) RaiServeSellerList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	resp := make([]company.DepartmentGroupSellers, 0)
+
+	groupId := 0
+	if utils.RunMode == "release" {
+		groupId = 68
+	} else {
+		groupId = 132
+	}
+	subAdmins, err := system.GetAdminByGroupId(groupId)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取销售失败"
+		br.ErrMsg = "获取销售失败,Err:" + err.Error()
+		return
+	}
+
+	for _, seller := range subAdmins {
+		sellerItem := company.DepartmentGroupSellers{
+			AdminId:      fmt.Sprint(seller.AdminId),
+			RealName:     seller.RealName,
+			Authority:    seller.Authority,
+			RoleTypeCode: seller.RoleTypeCode,
+		}
+		resp = append(resp, sellerItem)
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

controllers/cygx/rai_serve.go

@@ -274,7 +274,15 @@ func (this *RaiServeCoAntroller) CoverageRate() {
 	companyId := this.GetString("CompanyId")
 	fmt.Println(companyId)
 	resp := new(cygx.RaiServeCoverageRateResp)
-	resp.List = []string{"22%", "33%", "44%", "55%"}
+	//ThisWeekAmount  string `comment:"本周互动量"`
+	//LastWeekAmount  string `comment:"上周互动量"`
+	//TwoWeekAmount   string `comment:"上上周互动量"`
+	//ThreeWeekAmount string `comment:"上三周互动量"`
+	resp.ThisWeekAmount = "22%"
+	resp.LastWeekAmount = "33%"
+	resp.TwoWeekAmount = "44%"
+	resp.ThreeWeekAmount = "55%"
+	//resp.List = []string{"22%", "33%", "44%", "55%"}
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
@@ -283,6 +291,8 @@ func (this *RaiServeCoAntroller) CoverageRate() {
 
 // @Title 明细列表
 // @Description 明细列表接口
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
 // @Param   CompanyId   query   int	  false       "公司ID"
 // @Param   TagType   query   int  false       "标签类型"
 // @Param   TagId   query   int  false       "标签ID"
@@ -303,10 +313,21 @@ func (this *RaiServeCoAntroller) BillList() {
 		br.Ret = 408
 		return
 	}
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
 	companyId, _ := this.GetInt("CompanyId")
 	tagType, _ := this.GetInt("TagType")
 	tagId, _ := this.GetInt("TagId")
 	serveTypeId, _ := this.GetInt("ServeTypeId")
+
+	var startSize int
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize = utils.StartIndex(currentIndex, pageSize)
 	if companyId == 0 {
 		br.Msg = "请选择对应公司ID"
 		return
@@ -332,13 +353,22 @@ func (this *RaiServeCoAntroller) BillList() {
 	case 3:
 
 	}
-	list, err := cygx.GetCygxRaiServeBillRespList(condition, pars)
+
+	total, err := cygx.GetCygxRaiServeBillCount(condition, pars)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，GetCygxRaiServeCompanyCountErr:" + err.Error()
+		return
+	}
+	list, err := cygx.GetCygxRaiServeBillRespList(condition, pars, startSize, pageSize)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，GetCygxRaiServeCompanyCountErr:" + err.Error()
 		return
 	}
+	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp := new(cygx.CygxRaiServeBillListResp)
+	resp.Paging = page
 	resp.CompanyName = companyInfo.CompanyName
 	resp.List = list
 	br.Ret = 200

controllers/cygx/user.go

@@ -676,7 +676,8 @@ func (this *UserController) TableList() {
 			{PermissionName: "关注的产业", Source: 5, TotalNum: countDetail.IndustryFllowNum},
 			{PermissionName: "搜索", Source: 7, TotalNum: countDetail.KeyWordNum},
 			{PermissionName: "音视频播放", Source: 9, TotalNum: countDetail.RoadshowVideoNum + countDetail.ActivityVideoNum + countDetail.ActivityVoiceNum},
-			{PermissionName: "首页标签点击", Source: 10, TotalNum: countDetail.TagNum}}
+			{PermissionName: "首页标签点击", Source: 10, TotalNum: countDetail.TagNum},
+			{PermissionName: "交流反馈", Source: 14, TotalNum: countDetail.TagNum}}
 		resp.List = List
 	} else {
 		countDetail, err := cygx.GetUserInteractionTableCountByYanXuan(userId)

models/cygx/cygx_user.go

@@ -1153,9 +1153,10 @@ func GetUserInteractionTableCount(uid int) (item *GetUserInteractionTableCountRe
 			( SELECT COUNT( 1 ) FROM cygx_micro_roadshow_video_history AS h  INNER JOIN cygx_micro_roadshow_video as v ON v.video_id = h.video_id WHERE  h.user_id = ?  ) AS roadshow_video_num,
 			( SELECT COUNT( 1 ) FROM cygx_activity_video_history AS h  INNER JOIN cygx_activity_video as v ON v.video_id = h.video_id WHERE  h.user_id = ?  ) AS activity_video_num,
 			( SELECT COUNT( 1 ) FROM cygx_activity_voice_history AS h  INNER JOIN cygx_activity_voice as v ON v.activity_id = h.activity_id WHERE  h.user_id = ?  ) AS activity_voice_num,
-			( SELECT COUNT(1) FROM cygx_tag_history as h INNER JOIN cygx_tag AS b ON h.tag_id = b.tag_id WHERE h.user_id = ?  ) AS tag_num
+			( SELECT COUNT(1) FROM cygx_tag_history as h INNER JOIN cygx_tag AS b ON h.tag_id = b.tag_id WHERE h.user_id = ?  ) AS tag_num,
+			( SELECT COUNT(1) FROM cygx_user_feedback as h WHERE h.user_id = ?  ) AS tag_num,
 			FROM  dual `
-	err = o.Raw(sql, uid, uid, uid, uid, uid, uid, uid, uid, uid, uid, uid, uid).QueryRow(&item)
+	err = o.Raw(sql, uid, uid, uid, uid, uid, uid, uid, uid, uid, uid, uid, uid, uid).QueryRow(&item)
 	return
 }
 

models/cygx/rai_serve_bill.go

@@ -1,6 +1,9 @@
 package cygx
 
-import "github.com/beego/beego/v2/client/orm"
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
+)
 
 type RaiServeTypeResp struct {
 	ServeTypeId   int    `description:"服务类型id"`
@@ -35,7 +38,11 @@ type RaiServeTagListResp struct {
 }
 
 type RaiServeCoverageRateResp struct {
-	List []string
+	//List []string
+	ThisWeekAmount  string `comment:"本周互动量"`
+	LastWeekAmount  string `comment:"上周互动量"`
+	TwoWeekAmount   string `comment:"上上周互动量"`
+	ThreeWeekAmount string `comment:"上三周互动量"`
 }
 
 // 服务类型列表
@@ -84,18 +91,29 @@ type CygxRaiServeBillResp struct {
 }
 
 type CygxRaiServeBillListResp struct {
-	CompanyName string `comment:"公司名称"`
+	CompanyName string             `comment:"公司名称"`
+	Paging      *paging.PagingItem `description:"分页数据"`
 	List        []*CygxRaiServeBillResp
 }
 
+func GetCygxRaiServeBillCount(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_rai_serve_bill as art WHERE 1= 1  `
+	if condition != "" {
+		sqlCount += condition
+	}
+	err = o.Raw(sqlCount, pars).QueryRow(&count)
+	return
+}
+
 // 列表
-func GetCygxRaiServeBillRespList(condition string, pars []interface{}) (items []*CygxRaiServeBillResp, err error) {
+func GetCygxRaiServeBillRespList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxRaiServeBillResp, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_rai_serve_bill as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` ORDER BY bill_id DESC   LIMIT 1000 `
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	sql += ` ORDER BY bill_id DESC   LIMIT ?,? `
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }

routers/commentsRouter.go

@@ -9997,6 +9997,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"],
+        beego.ControllerComments{
+            Method: "RaiServeSellerList",
+            Router: `/seller/rai_serve/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"],
         beego.ControllerComments{
             Method: "RoadshowFiccList",