Merge branch 'cygx_13.2' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/activity.go

@@ -753,16 +753,17 @@ func (this *ActivityController) Detail() {
 		return
 	}
 	resp.IsResearchSpecial = isResearchSpecial
+	detailResp := services.ActivityButtonShow(activityInfo, user, make([]string, 0))
+	detailResp, err = services.ActivityDetaailShow(detailResp)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "ActivityDetaailShow Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)
+		return
+	}
 	if havePower {
 		resp.HasPermission = 1
 		//permissionArr := make([]string, 0)
-		detailResp := services.ActivityButtonShow(activityInfo, user, make([]string, 0))
-		detailResp, err = services.ActivityDetaailShow(detailResp)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "ActivityDetaailShow Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)
-			return
-		}
+
 		//处理活动关联的产业
 		industrialList, err := models.GetIndustrialActivityGroupManagementList(activityId)
 		if err != nil && err.Error() != utils.ErrNoRow() {
@@ -872,7 +873,7 @@ func (this *ActivityController) Detail() {
 			return
 		}
 		detailResp.SignupType = mapActivitySignup[activityId]
-		resp.Detail = detailResp
+
 	} else {
 		hasPermission, sellerName, sellerMobile, popupMsg, err := services.GetUserHasPermission(user)
 		if err != nil {
@@ -886,6 +887,7 @@ func (this *ActivityController) Detail() {
 		resp.SellerName = sellerName
 		resp.SellerMobile = sellerMobile
 	}
+	resp.Detail = detailResp
 	// 判断是否属于研选类型的活动
 	if strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
 		resp.IsResearch = true

services/activity.go

@@ -1308,6 +1308,13 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 	if mfyxUserPermissionTotal == 1 {
 		permissionStr += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
 	}
+
+	//如果用户开通了研选扣点包，但是没开通研选订阅，那么就拼接一个研选订阅的权限名称
+	if !strings.Contains(permissionStr, utils.CHART_PERMISSION_NAME_MF_YANXUAN) && strings.Contains(permissionStr, utils.YAN_XUAN_KOU_DIAN_BAO_NAME) {
+		permissionStr += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
+		permissionStrZhengShi += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
+	}
+
 	//如果一个权限都没有就返回无权限
 	if permissionStr == "" {
 		return

utils/config.go

@@ -106,7 +106,7 @@ func init() {
 		WxMsgTemplateIdApply = "PaoDanHGlt1kFw5q-4_ipJSwO3FyZpxSSNg4rwB7YCk"
 		WxMsgTemplateIdAskMsgMobile = "15557270714,17634786714,18767183922,17516315016"
 		WxMsgTemplateIdAskMsgXzs = "IpS-yuNNQc8osCoy20jPHNkvBUyKRL1NGn7c0G9xmQA" //手机号用户【XXX】发送模板消息模板ID(小助手)
-		WxMsgTemplateIdArticleUserRemind = "7qe3i4MrGxAIPhJeMgoqqw6j0A_foUB65DLSmxKe05s"
+		WxMsgTemplateIdArticleUserRemind = "fxnlsjx-gm3dAZVJf6f3w27wA7anETl42kexXLP8FDs"
 
 		WxOpenAppId = "wx26ccbe242908ed73"                   //公众平台AppId
 		WxOpenAppSecret = "0851cc85027c6eb74a400016648ecda8" //公众平台AppSecret

utils/constants.go

@@ -73,8 +73,10 @@ const (
 	CE_LUE_NAME                      string = "策略"
 	CE_LUE_ID                        int    = 23
 	CHART_PERMISSION_NAME_YANXUAN    string = "研选"
-	CHART_PERMISSION_NAME_MF_YANXUAN string = "买方研选"
-	CHART_PERMISSION_ID_YANXUAN      int    = 31
+	CHART_PERMISSION_NAME_MF_YANXUAN string = "研选订阅"
+	CHART_PERMISSION_ID_YANXUAN      int    = 31      //权限研选订阅id
+	YAN_XUAN_KOU_DIAN_BAO_ID         int    = 52      //研选扣点包ID
+	YAN_XUAN_KOU_DIAN_BAO_NAME       string = "研选扣点包" //研选扣点包ID
 	YI_YAO_NAME                      string = "医药"
 	YI_YAO_OTHER_IMG                 string = "https://hzstatic.hzinsights.com/static/temp/20221118202211/20221118/qzPm61bVf40Je7c5iL1s4CbrDcpv.png" //医药其它图片
 	YI_YAO_ID                        int    = 22