Merge branch 'crm_14.7' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -519,7 +519,7 @@ func (this *ActivityCoAntroller) Detail() {
 			industryUserFollowMap, err := services.GetIndustryUserFollowMap(user)
 			if err != nil {
 				br.Msg = "获取信息失败"
-				br.ErrMsg = "GetActivitySignupResp，Err:" + err.Error()
+				br.ErrMsg = "GetIndustryUserFollowMap，Err:" + err.Error()
 				return
 			}
 			for _, v := range industrialListNew {

controllers/article.go

@@ -261,7 +261,8 @@ func (this *ArticleController) Detail() {
 				br.ErrMsg = "获取用户信息失败,Err:" + err.Error()
 				return
 			}
-			if userType == 1 && strings.Contains(detail.CategoryName, "研选") {
+			//永续客户,无法查看研选权限，但是下面的联系人，单独开通研选后，也可以查看研选内容
+			if userType == 1 && strings.Contains(detail.CategoryName, "研选") && mfyxUserPermissionTotal == 0 {
 				hasPersion = false
 			}
 			//if detail.IsReport == 1 {

controllers/micro_roadshow.go

@@ -975,6 +975,7 @@ func (this *MicroRoadShowController) TrainingList() {
 				list[i].BackgroundImg = videoMap[list[i].ChartPermissionId]
 			}
 		}
+		list[i].BackgroundImg = "https://hzstatic.hzinsights.com/cygx/micro_roadshow_default_cl_video.png" //前端小程序忘记添加音视频图标，先手动替换
 		// 分享图
 		if list[i].ShareImg == "" {
 			if list[i].Type == 1 {

services/activity.go

@@ -584,6 +584,13 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 	if permissionStr == "" {
 		return
 	}
+
+	//永续客户,无法查看研选权限，但是下面的联系人，单独开通研选后，也可以查看研选内容
+	if userType == 1 && strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) && mfyxUserPermissionTotal == 0 {
+		havePower = false
+		return
+	}
+
 	permissionStr += "," + utils.HONG_GUAN_NAME // 添加一个宏观权限
 	if permissionStrZhengShi == "" {
 		permissionStrZhengShi = utils.HONG_GUAN_NAME // 添加一个宏观权限
@@ -750,7 +757,7 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 		havePower = true
 	}
 
-	fmt.Println(permissionStrZhengShi)
+	//fmt.Println(permissionStrZhengShi)
 	//if (strings.Contains(activityInfo.ChartPermissionName, "研选") || activityInfo.ChartPermissionName == "策略") && strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
 	//	havePower = true
 	//	return

services/task.go

@@ -93,7 +93,7 @@ func Task() {
 		reportBillboardUpdate := task.NewTask("reportBillboardUpdate", "0 10 0 * * *", ReportBillboardUpdate) //报告榜单更新
 		task.AddTask("reportBillboardUpdate", reportBillboardUpdate)
 
-		doActivityOnenIdWxTemplateMsg := task.NewTask("doActivityOnenIdWxTemplateMsg", "0 30 16 * * 0", DoActivityOnenIdWxTemplateMsg) //周日下午四点半推送全部活动
+		doActivityOnenIdWxTemplateMsg := task.NewTask("doActivityOnenIdWxTemplateMsg", "0 30 16 * * 1", DoActivityOnenIdWxTemplateMsg) //周日下午四点半推送全部活动
 		task.AddTask("doActivityOnenIdWxTemplateMsg", doActivityOnenIdWxTemplateMsg)
 
 		updateCygxActivitySpecialSignupNum := task.NewTask("updateCygxActivitySpecialSignupNum", "0 25 0 * * *", UpdateCygxActivitySpecialSignupNum) //修改专项调研，用户与公司的参与数量