Merge branch 'clpt_v3.0' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/activity.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/medivhzhan/weapp/v2"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_clpt/models"
 	"hongze/hongze_clpt/services"
@@ -43,28 +44,6 @@ func (this *ActivityController) LabelTypeList() {
 	activeState := this.GetString("ActiveState")
 	var condition string
 	var pars []interface{}
-	//if whichDay != "" {
-	//	var startDate string
-	//	var endDate string
-	//	if whichDay == "1" {
-	//		startDate = time.Now().Format(utils.FormatDate)
-	//		endDate = startDate
-	//	} else if whichDay == "2" {
-	//		startDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-	//		endDate = startDate
-	//	} else {
-	//		startDate = time.Now().Format(utils.FormatDate)
-	//		endDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
-	//	}
-	//	startDate += " 00:00:00'"
-	//	endDate += " 23:59:59'"
-	//	condition += `AND activity_time BETWEEN ? AND ? `
-	//	pars = append(pars, startDate, endDate)
-	//}
-	//if activeState == "" {
-	//	activeState = "1,2"
-	//}
-	//condition += ` AND active_state  IN (` + activeState + `) `
 
 	// 查研观向7.4-始终查询宏观的活动
 	if chartPermissionIds != "" {
@@ -316,11 +295,6 @@ func (this *ActivityController) ActivityListNew() {
 		return
 	}
 
-	//for _, v := range list {
-	//	if mapDingActivityId[v.ActivityId] == 0 {
-	//		activityList = append(activityList, v)
-	//	}
-	//}
 	for k, v := range list {
 		if mapActivityVoice[v.ActivityId] != nil {
 			list[k].FileType = 1
@@ -864,8 +838,8 @@ func (this *ActivityController) SignupAdd() {
 		models.BindUserOutboundMobileByMobile(user.Mobile, countryCode, uid)
 	}
 	resp.SignupType = signupType
-	resp.SignupStatus = signupStatus
-	resp.HasPermission = hasPermission
+	//resp.SignupStatus = signupStatus
+	//resp.HasPermission = hasPermission
 	//if signupStatus == "Success" {
 	resp.ActivityId = activityId
 	//}
@@ -1367,26 +1341,26 @@ func (this *ActivityController) AskAdd() {
 		return
 	}
 	content := req.Content
-	//itemToken, err := services.WxGetToken()
-	//if err != nil {
-	//	br.Msg = "GetWxAccessToken Err:" + err.Error()
-	//	return
-	//}
-	//if itemToken.AccessToken == "" {
-	//	br.Msg = "accessToken is empty"
-	//	return
-	//}
-	//commerr, err := weapp.MSGSecCheck(itemToken.AccessToken, content)
-	//if err != nil {
-	//	br.Msg = "内容校验失败！"
-	//	br.ErrMsg = "内容校验失败，Err:" + err.Error()
-	//	return
-	//}
-	//if commerr.ErrCode != 0 {
-	//	br.Msg = "内容违规,请重新提交！"
-	//	br.ErrMsg = "颜文字内容违规，Err:" + commerr.ErrMSG
-	//	return
-	//}
+	itemToken, err := services.WxGetToken()
+	if err != nil {
+		br.Msg = "GetWxAccessToken Err:" + err.Error()
+		return
+	}
+	if itemToken.AccessToken == "" {
+		br.Msg = "accessToken is empty"
+		return
+	}
+	commerr, err := weapp.MSGSecCheck(itemToken.AccessToken, content)
+	if err != nil {
+		br.Msg = "内容校验失败！"
+		br.ErrMsg = "内容校验失败，Err:" + err.Error()
+		return
+	}
+	if commerr.ErrCode != 0 {
+		br.Msg = "内容违规,请重新提交！"
+		br.ErrMsg = "颜文字内容违规，Err:" + commerr.ErrMSG
+		return
+	}
 	activityId := req.ActivityId
 	activityInfo, errInfo := models.GetAddActivityInfoById(activityId)
 	if activityInfo == nil {

services/activity.go

@@ -631,7 +631,7 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 	if activityInfo.YidongActivityId != "" && permissionStr != "" && strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
 		havePower = true
 	}
-	if havePower {
+	if havePower && activityInfo.LimitPeopleNum > 0 {
 		//对于一些特殊的活动，即使权限满足也不给产看
 		noPower, e := GetShareNoPowe(activityInfo, permissionStr, userType, user)
 		if e != nil {