Merge branch 'cygx/cygx_11.1' of http://8.136.199.33:3000/hongze/hz_crm_api

controllers/cygx/apply_record.go

@@ -6,7 +6,9 @@ import (
 	"hongze/hz_crm_api/controllers"
 	"hongze/hz_crm_api/models"
 	"hongze/hz_crm_api/models/cygx"
+	cygxService "hongze/hz_crm_api/services/cygx"
 	"hongze/hz_crm_api/utils"
+	"strconv"
 )
 
 // 权益小程序
@@ -65,6 +67,19 @@ func (this *ApplyRecordController) ListSysRole() {
 		}
 	}
 
+	//权益申请销售只能看到自己名下的客户的申请 查研观向11.1
+	companyIds, err := cygxService.GetAdminLookUserCompanyIds(sysUser)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，GetAdminLookUserCompanyIds Err:" + err.Error()
+		return
+	}
+	lencompanyIds := len(companyIds)
+	if lencompanyIds > 0 {
+		condition = ` AND a.company_id_pay  IN (` + utils.GetOrmInReplace(lencompanyIds) + `)`
+		pars = append(pars, companyIds)
+	}
+
 	total, err := cygx.GetCygxApplyRecordCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -78,6 +93,33 @@ func (this *ApplyRecordController) ListSysRole() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+
+	var microvideoIds []int
+	for _, v := range list {
+		if v.Source == "roadshow" {
+			microvideoIds = append(microvideoIds, v.SourceId)
+		}
+	}
+	lenmicrovideoIds := len(microvideoIds)
+	mapmicrovideoChartPermissionId := make(map[int]int) //产业视频ID所对应的行业ID
+	mapmicrovideoIndustryId := make(map[int]int)        //产业视频ID所对应的行业ID
+	if lenmicrovideoIds > 0 {
+		var conditionmicrovideo string
+		var parsmicrovideo []interface{}
+		conditionmicrovideo = ` AND video_id IN (` + utils.GetOrmInReplace(lenmicrovideoIds) + `)`
+		parsmicrovideo = append(parsmicrovideo, microvideoIds)
+		listmicrovideo, err := cygx.GetMicroRoadshowVideoList(conditionmicrovideo, "", parsmicrovideo, 0, lenmicrovideoIds)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取数据失败，Err:" + err.Error()
+			return
+		}
+		for _, v := range listmicrovideo {
+			mapmicrovideoChartPermissionId[v.VideoId] = v.ChartPermissionId
+			mapmicrovideoIndustryId[v.VideoId] = v.IndustryId
+		}
+	}
+
 	for i, v := range list {
 		if list[i].SellerName == "/" {
 			list[i].SellerName = ""
@@ -122,7 +164,29 @@ func (this *ApplyRecordController) ListSysRole() {
 		case 2:
 			list[i].ApplicationSource += "(络町)"
 		}
+
+		switch v.Source {
+		case "article": //文章详情
+			list[i].HttpUrl = utils.CYGX_WEB_URL + "/material/info/" + strconv.Itoa(v.SourceId)
+		case "activity": //活动详情
+			list[i].HttpUrl = utils.CYGX_WEB_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
+		case "activityvoice": //活动音频详情
+			list[i].HttpUrl = utils.CYGX_WEB_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
+		case "activityvideo": //活动视频详情
+			list[i].HttpUrl = utils.CYGX_WEB_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
+		case "productinterior": //产品内测
+			list[i].HttpUrl = utils.CYGX_WEB_URL + "/internal/article/" + strconv.Itoa(v.SourceId)
+		case "roadshow": //产业视频
+			list[i].HttpUrl = utils.CYGX_WEB_URL + "/indepth/info/" + strconv.Itoa(mapmicrovideoChartPermissionId[v.SourceId]) + "/" + strconv.Itoa(mapmicrovideoIndustryId[v.SourceId])
+		case "researchsummary": //本周研究汇总
+			list[i].HttpUrl = utils.CYGX_WEB_URL + "/summary/2/" + strconv.Itoa(v.SourceId)
+		case "minutessummary": //上周纪要汇总
+			list[i].HttpUrl = utils.CYGX_WEB_URL + "/summary/1/" + strconv.Itoa(v.SourceId)
+		case "reportselection": //报告精选（重点公司）
+			list[i].HttpUrl = utils.CYGX_WEB_URL + "/recent/" + strconv.Itoa(v.SourceId)
+		}
 	}
+
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp := new(cygx.CygxApplyRecordListResp)
 	resp.List = list

models/cygx/apply_record.go

@@ -30,9 +30,43 @@ type CygxApplyRecord struct {
 	RegisterPlatform         int    `description:"来源 1小程序，2：网页"`
 	InviteCompanySource      int    `description:"三方来源 ，1：弘则本身，2:络町"`
 	ApplicationSource        string `description:"申请来源"`
+	SourceId                 int    `description:"资源ID"`
+	Source                   string `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
+	Title                    string `description:"标题"`
 }
 
-func GetCygxApplyRecord(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxApplyRecord, err error) {
+type CygxApplyRecordResp struct {
+	ApplyRecordId            int    `orm:"column(apply_record_id);pk" description:"申请试用id"`
+	BusinessCardUrl          string `description:"名片地址"`
+	RealName                 string `description:"姓名"`
+	CompanyName              string `description:"公司名称"`
+	Mobile                   string `description:"手机号"`
+	CreateTime               string `description:"创建时间"`
+	ApplyMethod              int    `description:"1:已付费客户申请试用，2:非客户申请试用"`
+	Status                   int    `description:"0:未处理,1:已处理"`
+	DealTime                 string `description:"处理时间"`
+	Email                    string `description:"邮箱"`
+	SellerName               string `description:"销售"`
+	CompanyIdPay             int    `description:"1：为潜在客户，大于1现有客户"`
+	InviteeMobile            string `description:"邀请人手机号"`
+	InviteeCompany           string `description:"邀请人公司名称"`
+	InviteeCompanyId         string `description:"邀请人公司ID"`
+	ApplySource              string `description:"申请来源"`
+	InviteeEmail             string `description:"邀请人邮箱"`
+	IsInviteeComanyExistence bool   `description:"邀请公司是否还存在"`
+	InviteeCompanyNum        int    `description:"邀请公司是否还存在（辅助字段）"`
+	CompanyIdType            int    `description:"用户状态，1：潜在客户 、2：现有客户 、3：FICC客户 、4：现有客户（正式，无对应权限） 、5：现有客户（试用，无对应权限）  、6：现有客户（试用暂停） 、7：现有客户（冻结） 、8：现有客户（流失） "`
+	CompanyIdTypeName        string `description:"用户状态，1：潜在客户 、2：现有客户 、3：FICC客户 、4：现有客户（正式，无对应权限） 、5：现有客户（试用，无对应权限）  、6：现有客户（试用暂停） 、7：现有客户（冻结） 、8：现有客户（流失） "`
+	RegisterPlatform         int    `description:"来源 1小程序，2：网页"`
+	InviteCompanySource      int    `description:"三方来源 ，1：弘则本身，2:络町"`
+	ApplicationSource        string `description:"申请来源"`
+	SourceId                 int    `description:"资源ID"`
+	Source                   string `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial"`
+	Title                    string `description:"标题"`
+	HttpUrl                  string `description:"跳转地址"`
+}
+
+func GetCygxApplyRecord(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxApplyRecordResp, err error) {
 	o := orm.NewOrm()
 
 	sql := ` SELECT DISTINCT a.*,i.invitee_mobile,i.invitee_company,i.invitee_email,invitee_company_id, GROUP_CONCAT(b.seller_name ORDER BY b.product_id ASC SEPARATOR '/') AS seller_name,c.email,(SELECT COUNT(1) FROM company WHERE company_id =invitee_company_id ) as invitee_company_num
@@ -71,7 +105,7 @@ GROUP_CONCAT(b.seller_name ORDER BY b.product_id ASC SEPARATOR '/') AS seller_na
 }
 
 type CygxApplyRecordListResp struct {
-	List   []*CygxApplyRecord
+	List   []*CygxApplyRecordResp
 	Paging *paging.PagingItem `description:"分页数据"`
 }
 

services/cygx/admin_power.go

@@ -2,9 +2,12 @@ package cygx
 
 import (
 	"errors"
+	"hongze/hz_crm_api/models/company"
 	"hongze/hz_crm_api/models/cygx"
 	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/utils"
 	"strconv"
+	"strings"
 )
 
 // 获取这个销售所能查看的手机号权限
@@ -29,3 +32,41 @@ func GetAdminLookUserMobile(adminInfo *system.Admin) (mapMobile map[string]strin
 	mapMobile = mapUserMobile
 	return
 }
+
+// 获取这个销售所能查看的手机号权限
+func GetAdminLookUserCompanyIds(sysUser *system.Admin) (companyIds []int, err error) {
+	//如果不是管理员，权益管理员那么就对可见权限范围做处理
+	adminIds := make([]int, 0)
+	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN {
+		if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP {
+			//如果是权益的组长就获取下面的组员
+			adminList, e := system.GetAdminListByGroupId(sysUser.GroupId)
+			if e != nil {
+				err = errors.New("GetAdminListByGroupId , Err: " + e.Error())
+				return
+			}
+			for _, v := range adminList {
+				adminIds = append(adminIds, v.AdminId)
+			}
+		} else {
+			adminIds = append(adminIds, sysUser.AdminId)
+		}
+		var adminIdGroup string
+		for _, v := range adminIds {
+			adminIdGroup += strconv.Itoa(v) + ","
+		}
+		adminIdGroup = strings.TrimRight(adminIdGroup, ",")
+		companyProductList, e := company.GetCompanyProductsBySellerId(adminIdGroup)
+		if e != nil {
+			err = errors.New("GetCompanyProductsBySellerId , Err: " + e.Error())
+			return
+		}
+
+		for _, v := range companyProductList {
+			companyIds = append(companyIds, v.CompanyId)
+		}
+		companyIds = append(companyIds, 1) //添加潜在客户
+	}
+
+	return
+}

utils/config.go

@@ -61,6 +61,7 @@ var (
 	WxMsgTemplateIdWithRoadshowPending       string //路演->研究员收到待处理的申请
 	WxMsgTemplateIdWithRoadshowDetailResult  string //路演->销售收到处理结果
 	WxMsgTemplateIdWithRoadshowDeleteNotice  string //路演->研究员收到活动删除通知
+	CYGX_WEB_URL                             string //查研观向web端网址
 
 	WxMsgTemplateIdWithYbCommunityQuestion string // 研报小程序->问答社区回复通知
 	WxMsgTemplateIdWithSealApplyFinished   string // 用印申请-已签回通知
@@ -244,6 +245,7 @@ ZwIDAQAB
 		IndexName = "cygx_article_v03_23"
 		IndexNameArticleHistory = "cygx_article_history_v07_08"
 		IndexNameComprehensive = "cygx_comprehensive"
+		CYGX_WEB_URL = "https://web.hzinsights.com"
 		TemplateCompanyApplyRedirectUrl = "https://ficc.hzinsights.com/approval/approval/list"
 
 		//同花顺正式地址
@@ -283,6 +285,7 @@ ZwIDAQAB
 		IndexName = "cygx_article_v1"
 		IndexNameArticleHistory = "cygx_article_history_v1"
 		IndexNameComprehensive = "cygx_comprehensive_test"
+		CYGX_WEB_URL = "https://clpttest.hzinsights.com"
 
 		//同花顺测试地址
 		THS_SendUrl = `https://mtest.10jqka.com.cn/gateway/ps/syncNews`