Merge branch 'crm/need_1061' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/activity.go

@@ -1085,7 +1085,7 @@ func (this *ActivityCoAntroller) ActivityList() {
 		}
 		list[k].IsUpload = mapUpload[v.ActivityId]
 		//是否展示签到码
-		if (v.ActivityTypeId == 5 || v.ActivityTypeId == 6 || v.ActivityTypeId == 8) && v.SigninImg != "" && v.ActiveState == 1 && v.PublishStatus == 1 {
+		if utils.InArrayByInt(utils.SHOW_SIGNIN_BUTTON_ACTIVITY_TYPE_ID, v.ActivityTypeId) && v.SigninImg != "" && v.ActiveState == 1 && v.PublishStatus == 1 {
 			list[k].IsShowSigninButton = true
 		}
 	}

services/cygx/activity_poster.go

@@ -97,7 +97,7 @@ func MakeActivitySigninImg(activityId int) (imgUrl string, err error) {
 	if activityInfo == nil {
 		return
 	}
-	if activityInfo.ActivityTypeId == 3 || activityInfo.ActivityTypeId == 5 || activityInfo.ActivityTypeId == 6 || activityInfo.ActivityTypeId == 8 {
+	if !utils.InArrayByInt(utils.SHOW_SIGNIN_BUTTON_ACTIVITY_TYPE_ID, activityInfo.ActivityTypeId) {
 		return
 	}
 	itemToken, err := models.GetWxToken(utils.WxCygxAppId, utils.WxCygxAppSecret)

utils/constants.go

@@ -431,6 +431,7 @@ const (
 
 var FilterPermissionNameRai = []string{"专家", "路演/专项点数", "海外调研", "路演服务"} // 权益某些地方不展示的行业
 var FilterPermissionNameRai2 = []string{"专家", "路演/专项点数", "海外调研"}        // 权益某些地方不展示的行业
+var SHOW_SIGNIN_BUTTON_ACTIVITY_TYPE_ID = []int{4, 5, 6, 8}             //展示下载签到码的活动类型
 
 // GetRaiChartPermissionIdSpecialPoint 获取权益权限，专项路演调研权限ID
 func GetRaiChartPermissionIdSpecialPoint() (chartPermissionId int) {