no message

models/activity.go

@@ -427,6 +427,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
             art.is_can_outbound_call,
             art.city,
             art.is_research_points,
+            art.siginup_deadline,
 			art.activity_time 
 		FROM
 			cygx_activity AS art
@@ -461,6 +462,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			"",
 			"",
 			"",
+			"",
 			art.activity_time 
 		FROM
 			cygx_activity_special AS art

services/activity.go

@@ -975,16 +975,24 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 	if (activityInfo.ActivityTypeId == 3 || activityInfo.ActivityTypeId == 5) && activityInfo.YidongActivityId == "" && strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
 		isResearchSpecial = true
 	}
-	//如果是 研选扣点的必须要有研选的正式权限
+	//如果是 对用户的研选扣点的必须要有研选的正式权限
 	if activityInfo.IsResearchPoints {
-		if !strings.Contains(permissionStr, utils.CHART_PERMISSION_NAME_YANXUAN) {
-			//如果连试用权限都没有，那么久按照普通的研选样式展示
-			isResearchSpecial = false
-		}
-		if !strings.Contains(permissionStrZhengShi, activityInfo.ChartPermissionName) {
-			havePower = false
+		//获取活动对用户要扣的点
+		userPointsNum, e := models.GetCygxActivityPointsSetUserNum(activityInfo.ActivityId)
+		if e != nil {
+			err = errors.New("GetActivitySignupSuccessByUserCountNoHz, Err: " + e.Error())
 			return
 		}
+		if userPointsNum > 0 {
+			if !strings.Contains(permissionStr, utils.CHART_PERMISSION_NAME_YANXUAN) {
+				//如果连试用权限都没有，那么久按照普通的研选样式展示
+				isResearchSpecial = false
+			}
+			if !strings.Contains(permissionStrZhengShi, activityInfo.ChartPermissionName) {
+				havePower = false
+				return
+			}
+		}
 	}
 
 	//处理决策人可见权限

services/activity_signup.go

@@ -81,6 +81,7 @@ func CheckSiginupDeadline(activityInfo *models.ActivityDetail) (checkTime bool,
 	checkTime = true
 	if activityInfo.SiginupDeadline != utils.FormatDateTimeInit {
 		timeResp := utils.StrTimeToTime(activityInfo.SiginupDeadline)
+		fmt.Println(timeResp)
 		if timeResp.Before(time.Now()) {
 			checkTime = false
 			popupMsg = "该活动已截止报名\n\n若想参加，请联系对口销售"