|
@@ -94,7 +94,7 @@ func CheckActivityPoints(activityInfo *models.ActivityDetail, wxUser *models.WxU
|
|
//获取活动对用户要扣的点
|
|
//获取活动对用户要扣的点
|
|
userPointsNum, e := models.GetCygxActivityPointsSetUserNum(activityInfo.ActivityId)
|
|
userPointsNum, e := models.GetCygxActivityPointsSetUserNum(activityInfo.ActivityId)
|
|
if e != nil {
|
|
if e != nil {
|
|
- err = errors.New("GetActivitySignupSuccessByUserCountNoHz, Err: " + e.Error())
|
|
|
|
|
|
+ err = errors.New("GetCygxActivityPointsSetUserNum, Err: " + e.Error())
|
|
return
|
|
return
|
|
}
|
|
}
|
|
// 获取用户所在公司剩余的点
|
|
// 获取用户所在公司剩余的点
|
|
@@ -105,7 +105,7 @@ func CheckActivityPoints(activityInfo *models.ActivityDetail, wxUser *models.WxU
|
|
}
|
|
}
|
|
if companyPointsNum-userPointsNum < 0 {
|
|
if companyPointsNum-userPointsNum < 0 {
|
|
checkPoints = false
|
|
checkPoints = false
|
|
- popupMsg = "点数不足,若想报名,\n请联系对口销售充值\n\n当前剩余点数:0\n本次会议扣除点数:0.5"
|
|
|
|
|
|
+ popupMsg = "点数不足,若想报名,\n请联系对口销售充值"
|
|
}
|
|
}
|
|
companyPoints = fmt.Sprint(companyPointsNum)
|
|
companyPoints = fmt.Sprint(companyPointsNum)
|
|
activityPoints = fmt.Sprint(userPointsNum)
|
|
activityPoints = fmt.Sprint(userPointsNum)
|
|
@@ -125,7 +125,7 @@ func CheckActivityUserEmail(activityInfo *models.ActivityDetail, wxUser *models.
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
-// 校验报名是否需要绑定邮箱
|
|
|
|
|
|
+// // 校验报名顺序 截止时间>点数>邮箱
|
|
func CheckActivityUserAll(activityInfo *models.ActivityDetail, wxUser *models.WxUserItem) (popupMsg string, err error) {
|
|
func CheckActivityUserAll(activityInfo *models.ActivityDetail, wxUser *models.WxUserItem) (popupMsg string, err error) {
|
|
_, popupMsg = CheckSiginupDeadline(activityInfo)
|
|
_, popupMsg = CheckSiginupDeadline(activityInfo)
|
|
if popupMsg != "" {
|
|
if popupMsg != "" {
|