Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/activity.go

@@ -461,7 +461,7 @@ func (this *ActivityNoLoginController) ActivityListNew() {
 		}
 
 		if strings.Contains(v.ChartPermissionName, "研选") && v.ActivityTypeId == 1 {
-			list[k].ActivityTypeName = "买方研选电话会"
+			//list[k].ActivityTypeName = "买方研选电话会"
 			list[k].ImgUrlText = utils.YAN_XUAN_IMG
 		}
 		if v.ActivityType == 0 {
@@ -2207,7 +2207,7 @@ func (this *ActivityController) ScheduleList() {
 			list[k].IsResearch = true
 		}
 		if strings.Contains(v.ChartPermissionName, "研选") && v.ActivityTypeId == 1 {
-			list[k].ActivityTypeName = "买方研选电话会"
+			//list[k].ActivityTypeName = "买方研选电话会"
 			//list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
 			list[k].ImgUrlText = utils.YAN_XUAN_IMG
 		}

controllers/banner.go

@@ -284,13 +284,12 @@ func (this *BannerController) YxSurvey() {
 		item.SellerName = sellerItem.RealName
 	}
 	newId, err := models.AddCygxBannerYxSurvey(item)
-	//err = services.AddCygxBannerYxSurvey(user, content)
-	services.SendCygxBannerYxSurveyTemplateMsg(user, content, int(newId))
 	if err != nil {
 		br.Msg = "申请失败"
 		br.ErrMsg = "申请失败，Err:" + err.Error()
 		return
 	}
+	go services.SendCygxBannerYxSurveyTemplateMsg(user, content, int(newId))
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "记录成功"

services/activity_signup.go

@@ -79,7 +79,7 @@ func CheckActivitySignUpLimit(user *models.WxUserItem, activityInfo *models.Acti
 // 校验报名截止时间
 func CheckSiginupDeadline(activityInfo *models.ActivityDetail) (checkTime bool, popupMsg string) {
 	checkTime = true
-	if activityInfo.SiginupDeadline != utils.FormatDateTimeInit {
+	if activityInfo.SiginupDeadline != utils.FormatDateTimeInit && activityInfo.SiginupDeadline != "" {
 		timeResp := utils.StrTimeToTime(activityInfo.SiginupDeadline)
 		fmt.Println(timeResp)
 		if timeResp.Before(time.Now()) {

services/banner_yx_survey.go

@@ -82,7 +82,7 @@ func SendCygxBannerYxSurveyTemplateMsg(user *models.WxUserItem, content string,
 	for _, v := range listMobile {
 		mobiles = append(mobiles, v)
 	}
-
+	mobiles = append(mobiles, utils.MobileShenTao, utils.MobileZhangChuanXin, utils.MobileWangFang) // 添加沈涛、张传星、王芳手机号
 	openIdList, e := models.GetWxOpenIdByMobileSliceList(mobiles)
 	if e != nil {
 		err = errors.New("GetWxOpenIdByMobileSliceList, Err: " + e.Error() + configCode)

utils/constants.go

@@ -178,7 +178,7 @@ const (
 	WX_MSG_PATH_ACTIVITY_INDUSTRYR_EPORT = "reportPages/IndustryReport/IndustryReport?id="   //产业文章列表模板消息地址
 	WX_MSG_PATH_ACTIVITY_DETAIL          = "activityPages/activityDetail/activityDetail?id=" //活动模板消息地址
 	WX_MSG_PATH_APPLY_DETAIL             = "pages-message/applyFor/applyFor?id="             //潜在用户试用权限申请
-	WX_MSG_PATH_YX_SURVEY_DETAIL         = "pages-purchaser/survey/surveyDetail?suveryId="   //用户提交研选调研需求
+	WX_MSG_PATH_YX_SURVEY_DETAIL         = "pages-purchaser/survey/surveyDetail?surveyId="   //用户提交研选调研需求
 	WX_MSG_PATH_APPLY_COLLECTION_DETAIL  = "reportPages/bulletinDetail/bulletinDetail?id="   //精选看板申请详情页
 )
 
@@ -214,5 +214,11 @@ const (
 )
 
 const (
+<<<<<<< HEAD
 	COLLECTIONS_INFO_HTTP_URL = "https://vmp.hzinsights.com/v2/collections" // 上海策略平台精选看板路由
+=======
+	MobileShenTao       = "18767183922" //沈涛手机号
+	MobileZhangChuanXin = "15557270714" // 张传星手机号
+	MobileWangFang      = "18621268829" // 王芳手机号
+>>>>>>> fec6b44aacf712e65ebc6b1c721ae4d3c8792fb6
 )