专项调研报名

controllers/activity_special.go

@@ -328,7 +328,7 @@ func (this *ActivitySpecialCoAntroller) SpecialDetail() {
 }
 
 // @Title报名
-// @Description 感兴趣、不感兴趣接口
+// @Description 报名
 // @Param	request	body models.ActivityIdRep true "type json string"
 // @Success Ret=200 {object} models.SignupSpecialStatus
 // @router /add [post]
@@ -513,15 +513,10 @@ func (this *ActivitySpecialCoAntroller) SpecialTripAdd() {
 	resp.HasPermission = hasPermission
 	resp.ActivityId = activityId
 	if hasPermission == 1 {
-		resultTime := utils.StrTimeToTime(activityInfo.ActivityTime) //时间字符串格式转时间格式
-		if time.Now().After(resultTime.Add(-time.Minute * 60)) {
-			resp.SignupStatus = 4
-			resp.PopupMsg = "感谢参与，本次报名会扣除一次贵司在弘则的调研点数。"
-			resp.PopupMsg2 = "由于每场活动人数有限，如果不能参加请提前48小时取消，未及时取消导致影响其他客户报名将会维持扣点。"
-			br.Ret = 200
-			br.Success = true
-			br.Msg = "操作成功"
-			br.Data = resp
+		signupStatus, popupMsg, popupMsg2, err := services.SpecialTripPopupMsg(activityInfo, user)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "SpecialTripPopupMsg,Err:" + err.Error()
 			return
 		}
 		total, err := models.GetUserActivitySpecialTripCount(user.UserId, activityId)
@@ -530,6 +525,9 @@ func (this *ActivitySpecialCoAntroller) SpecialTripAdd() {
 			br.ErrMsg = "获取日程数量信息失败,Err:" + err.Error()
 			return
 		}
+		resp.PopupMsg = popupMsg
+		resp.PopupMsg2 = popupMsg2
+		resp.SignupStatus = signupStatus
 		//判断是删除还是添加
 		if total == 0 {
 			//获取销售信息

models/activity_special_trip.go

@@ -58,9 +58,9 @@ func GetUserActivitySpecialTripCount(uid, activityId int) (count int, err error)
 
 //获取某一活动的报名的数量
 func GetActivitySpecialTripCountByActivityId(condition string, pars []interface{}) (count int, err error) {
-	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_special_trip  WHERE    1 = 1 `
+	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_special_trip  WHERE    1 = 1 ` + condition
 	o := orm.NewOrm()
-	err = o.Raw(sqlCount, condition, pars).QueryRow(&count)
+	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 

services/activity_special_trip.go

@@ -27,12 +27,12 @@ func SpecialTripPopupMsg(activityInfo *models.CygxActivitySpecialDetail, user *m
 		err = errors.New("GetCygxActivitySpecialDetailList, Err: " + e.Error())
 		return
 	}
-	if activityInfo.LimitPeopleNum-tripTota > 1 {
+	if activityInfo.LimitPeopleNum-tripTota < 1 {
 		signupStatus = 2
-		popupMsg = "活动开始前1小时内无法报名，请联系对口销售处理"
+		popupMsg = "此活动报名人数已满，请留意下期活动"
 		return
 	}
-	signupStatus = 4
+	//signupStatus = 4
 	popupMsg = "感谢参与，本次报名会扣除一次贵司在弘则的调研点数。"
 	popupMsg2 = "由于每场活动人数有限，如果不能参加请提前48小时取消，未及时取消导致影响其他客户报名将会维持扣点。"
 	return