Forráskód Böngészése

Merge branch 'mfyx_3.6' of http://8.136.199.33:3000/cxzhang/hongze_mfyx into debug

xingzai 7 hónapja
szülő
commit
920f6468bc
1 módosított fájl, 5 hozzáadás és 2 törlés
  1. 5 2
      controllers/activity.go

+ 5 - 2
controllers/activity.go

@@ -603,8 +603,11 @@ func (this *ActivityCoAntroller) Detail() {
 
 	//已结束的活动,音视频作为商品的价格处理
 	if activityInfo.ActiveState == "3" {
-		resp.GoodsList = services.GetGoodsInfoByActivityVivo(activityInfo)                                             //音视频回放商品信息
-		resp.VivoPoints = services.GetActivityVivoPoints(activityInfo, user, havePower)                                //单场活动信息
+		resp.GoodsList = services.GetGoodsInfoByActivityVivo(activityInfo)              //音视频回放商品信息
+		resp.VivoPoints = services.GetActivityVivoPoints(activityInfo, user, havePower) //单场活动信息
+		if resp.VivoPoints.PointPermission == 2 || resp.VivoPoints.PointPermission == 3 {
+			resp.IsShowWxPay = utils.IS_SHOW_WX_PAY //是否展示微信支付按钮
+		}
 		resp.OrderCode, resp.PayTimeCountdown = services.GetHaverEquallyOrderByUser10MinByActivtyVivo(uid, activityId) //截止支付时间倒计时
 	} else {
 		if (!activityInfo.IsResearchPoints && activityInfo.IsLimitPeople == 0) || activityInfo.YidongActivityId != "" { //易董的活动 或者(不扣点且不限制人数)走月卡日卡逻辑