no message

controllers/activity.go

@@ -1201,6 +1201,11 @@ func (this *ActivityController) SignupCancel() {
 		br.ErrMsg = "操作失败,Err:" + errInfo.Error()
 		return
 	}
+	checkTime, _ := services.CheckSiginupDeadline(activityInfo)
+	if !checkTime {
+		br.ErrMsg = "报名名单已提交举办方，若想取消，请联系对口销售"
+		return
+	}
 	resultTime := utils.StrTimeToTime(activityInfo.ActivityTime) //时间字符串格式转时间格式
 	if time.Now().After(resultTime.Add(-time.Minute * 60)) {
 		if signupType == 1 {
@@ -1942,6 +1947,7 @@ func (this *ActivityController) ActivityListSearch() {
 		item.IsCanOutboundCall = v.IsCanOutboundCall
 		item.IsLimitPeople = v.IsLimitPeople
 		item.IsResearchPoints = v.IsResearchPoints
+		item.SiginupDeadline = v.SiginupDeadline
 		// 判断是否属于研选类型的活动
 		if strings.Contains(v.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
 			item.IsResearch = true

models/activity.go

@@ -224,6 +224,7 @@ type ActivityListResp struct {
 	IsResearchSpecial       bool                       `description:"是否属于特殊的研选"`
 	IsExternalLabel         bool                       `description:"是否为外部资源"`
 	IsResearchPoints        bool                       `description:"是否为研选扣点"`
+	SiginupDeadline         string                     `description:"报名截止时间"`
 }
 
 type ActivityCheck struct {

models/resource_data.go

@@ -70,6 +70,7 @@ type CygxResourceDataResp struct {
 	IsResearchSpecial       bool                       `description:"是否属于特殊的研选"`
 	IsExternalLabel         bool                       `description:"是否为外部资源"`
 	IsResearchPoints        bool                       `description:"是否为研选扣点"`
+	SiginupDeadline         string                     `description:"报名截止时间"`
 }
 
 type HomeResourceDataListResp struct {

services/activity.go

@@ -603,6 +603,9 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 	if (articleDetail.ActivityTypeId == 3 || articleDetail.ActivityTypeId == 5) && articleDetail.YidongActivityId == "" && strings.Contains(articleDetail.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) && utils.InArrayByStr(permissionArr, utils.CHART_PERMISSION_NAME_MF_YANXUAN) {
 		articleDetail.IsResearchSpecial = true
 	}
+	if articleDetail.SiginupDeadline == utils.FormatDateTimeInit { //报名截止时间处理
+		articleDetail.SiginupDeadline = ""
+	}
 
 	activityTimeText := articleDetail.ActivityTimeText
 	activityTimeText = strings.Replace(activityTimeText, "（", "(", -1)
@@ -763,6 +766,7 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 		LinkParticipants:        v.LinkParticipants,
 		IsResearchPoints:        v.IsResearchPoints,
 		IsExternalLabel:         v.IsExternalLabel,
+		SiginupDeadline:         v.SiginupDeadline,
 	}
 	au := new(models.UserPermissionAuthInfo)
 	au.SellerName = authInfo.SellerName

services/activity_button.go

@@ -303,6 +303,9 @@ func ActivityButtonShowSearch(item *models.ActivityDetail, user *models.WxUserIt
 	//if articleDetail.IsHideAppointment == 0 {
 	//	articleDetail.IsShowAppointment = IsShowAppointmentByactivityInfo(articleDetail, articleDetail.ChartPermissionName)
 	//}
+	if articleDetail.SiginupDeadline == utils.FormatDateTimeInit { //报名截止时间处理
+		articleDetail.SiginupDeadline = ""
+	}
 
 	//articleDetail.SourceType = 1
 	activityTimeText := articleDetail.ActivityTimeText

services/activity_signup.go

@@ -107,7 +107,7 @@ func CheckActivityPoints(activityInfo *models.ActivityDetail, wxUser *models.WxU
 		}
 		if companyPointsNum-userPointsNum < 0 {
 			checkPoints = false
-			popupMsg = "点数不足，若想报名，\n请联系对口销售充值\n\n当前剩余点数：0\n本次会议扣除点数：0.5"
+			popupMsg = "点数不足，若想报名，\n请联系对口销售充值"
 		}
 		companyPoints = fmt.Sprint(companyPointsNum)
 		activityPoints = fmt.Sprint(userPointsNum)