no message

controllers/activity.go

@@ -1891,6 +1891,8 @@ func (this *ActivityCoAntroller) Check() {
 	if resp.CheckPoints {
 		//如果通过点数的校验，就来校验邮箱
 		resp.CheckEmail, resp.PopupMsg = services.CheckActivityUserEmail(activityInfo, user)
+	} else {
+		resp.IsShowWxPay = utils.IS_SHOW_WX_PAY
 	}
 	// 判断是否属于研选类型的活动
 	if strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {

models/activity.go

@@ -87,6 +87,7 @@ type ActivityCheck struct {
 	CheckPoints       bool   `description:"扣点是否通过校验"`
 	CompanyPoints     string `description:"公司剩余点数"`
 	ActivityPoints    string `description:"本场活动要扣除的点数"`
+	IsShowWxPay       bool   `description:"是否展示微信支付"`
 }
 
 type ActivityIdRep struct {
@@ -255,6 +256,7 @@ type CygxActivityResp struct {
 	IsShowWxPay        bool                   `description:"是否展示微信支付"`
 	IsCompanyApply     bool                   `description:"机构是否申请过试用"`
 	IsNeedBusinessCard bool                   `description:"是否需要上传名片"`
+	PayTimeCountdown   int                    `description:"支付时间倒计时"`
 	GoodsList          []*order.CygxGoodsResp `description:"商品信息"`
 }
 

services/activity_signup.go

@@ -103,9 +103,20 @@ func CheckActivityPoints(activityInfo *models.ActivityDetail, wxUser *models.WxU
 			err = errors.New("GetCompanyPoints, Err: " + e.Error())
 			return
 		}
+
 		if companyPointsNum-userPointsNum < 0 {
 			checkPoints = false
-			popupMsg = "点数不足，若想报名，\n请联系对口销售充值"
+			var popupPriceMsg string
+			if utils.IS_SHOW_WX_PAY {
+				goodsList := GetGoodsInfoByActivity(activityInfo) //单场活动信息
+				for _, v := range goodsList {
+					popupPriceMsg = v.PopupPriceMsg //价格弹窗信息
+				}
+				popupMsg = "<div>点数不足，您可以通过单场付费 <span color=\"#D54941\">" + popupPriceMsg + "</span> 参与或者联系销售机构充值</div>"
+			} else {
+				popupMsg = "点数不足，若想报名，\n请联系对口销售充值"
+			}
+
 		}
 		companyPoints = fmt.Sprint(companyPointsNum)
 		activityPoints = fmt.Sprint(userPointsNum)

services/order.go

@@ -54,6 +54,8 @@ func GetGoodsInfoByActivity(item *models.ActivityDetail) (goodsListResp []*order
 		condition = ` AND  goods_id IN  (6) `
 	} else if item.ActivityTypeId == 3 && !item.IsResearchPoints { //非易董。公司调研电话会参会人扣点
 		condition = ` AND  goods_id IN  (7) `
+	} else if item.ActivityTypeId == 1 && item.IsResearchPoints { //专家电话会，不限制人数，研选扣点(1299元)
+		condition = ` AND  goods_id IN  (8) `
 	}
 	goodsList, e := order.GetCygxGoodsList(condition, pars)
 	if e != nil {