Browse Source

双十二促销

abiao 4 years ago
parent
commit
24ca86b4e1

+ 4 - 0
go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_exchange_controller.go

@@ -194,6 +194,10 @@ func (self *PayController) payExchange(oId, payWay, returnUrl, source, remark st
 		}
 		tp += freight
 		total_quan += freight
+		if sys_config.GetShutWechatPromotion() && !useCoupon {
+			self.ReturnError(403, apps.NotPayWayTime, "", nil)
+		}
+
 		if useCoupon {
 			//特殊促销期间券不够不允许支付
 			if sys_config.GetShutWechatPromotion() && userLeftBalanceCount < total_quan {

+ 12 - 10
go/gopath/src/fohow.com/apps/init.go

@@ -117,16 +117,18 @@ var (
 	UploadUserHeadError = []string{"uploadUserHeadError", "上传头像错误"}
 	AddressNotMatch     = []string{"addressNotMatch", "地址不匹配"}
 	NotUnPay            = []string{"notUnPay", "无法支付,该订单已支付或者已过期"}
-	NotEnoughPay        = []string{"notEnouphPay", "无法支付,提货券余额不足"}
-	NotRightPayWay      = []string{"notRightPayWay", "无法支付,该订单只支持微信支付"}
-	HasAlreadyPay       = []string{"hasAlreadyPay", "该订单已支付过"}
-	NotPayInTime        = []string{"notPayInTime", "没在规定时间内完成支付"}
-	PayWayNotAllow      = []string{"payWayNotAllow", "不支持该支付方式"}
-	PayNoAuthed         = []string{"payNoAuthed", "支付未授权"}
-	PhoneInvalid        = []string{"phoneInvalid", "手机号码格式不正确"}
-	PhoneExist          = []string{"phoneExist", "手机号码已被注册,请更换其他号码"}
-	SMSInvalid          = []string{"smsInvalid", "短信验证码不正确"}
-	CodesSendTooOften   = []string{"codesSendTooOften", "短信验证码发送过于频繁,请半小时后重试"}
+	NotPayWayTime       = []string{"notPayWayTime", "无法支付,促销期间只允许提货券支付"}
+
+	NotEnoughPay      = []string{"notEnouphPay", "无法支付,提货券余额不足"}
+	NotRightPayWay    = []string{"notRightPayWay", "无法支付,该订单只支持微信支付"}
+	HasAlreadyPay     = []string{"hasAlreadyPay", "该订单已支付过"}
+	NotPayInTime      = []string{"notPayInTime", "没在规定时间内完成支付"}
+	PayWayNotAllow    = []string{"payWayNotAllow", "不支持该支付方式"}
+	PayNoAuthed       = []string{"payNoAuthed", "支付未授权"}
+	PhoneInvalid      = []string{"phoneInvalid", "手机号码格式不正确"}
+	PhoneExist        = []string{"phoneExist", "手机号码已被注册,请更换其他号码"}
+	SMSInvalid        = []string{"smsInvalid", "短信验证码不正确"}
+	CodesSendTooOften = []string{"codesSendTooOften", "短信验证码发送过于频繁,请半小时后重试"}
 
 	WxMenusCreatedFailed = []string{"wxMenusCreatedFailed", "微信菜单创建失败"}
 	//小程序相关