双十二促销

go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_exchange_controller.go

@@ -194,8 +194,11 @@ func (self *PayController) payExchange(oId, payWay, returnUrl, source, remark st
 		}
 		tp += freight
 		total_quan += freight
+
+		quanLittle := false
 		if useCoupon {
 			if userLeftBalanceCount < total_quan {
+				quanLittle = true
 				totalCoupon = userLeftBalanceCount
 			} else {
 				totalCoupon = total_quan
@@ -205,7 +208,11 @@ func (self *PayController) payExchange(oId, payWay, returnUrl, source, remark st
 
 		//特殊促销期间券不够不允许支付
 		if sys_config.GetShutWechatPromotion() && total_weixin > 0 {
-			self.ReturnError(403, apps.NotEnoughPay, "", nil)
+			if quanLittle {
+				self.ReturnError(403, apps.NotEnoughPay, "", nil)
+			} else {
+				self.ReturnError(403, apps.PayWayNotAllow, "", nil)
+			}
 		}
 
 		if total_weixin > 0 {

go/gopath/src/fohow.com/apps/init.go

@@ -119,11 +119,11 @@ var (
 	NotUnPay            = []string{"notUnPay", "无法支付，该订单已支付或者已过期"}
 	NotPayWayTime       = []string{"notPayWayTime", "无法支付，促销期间只允许提货券支付"}
 
-	NotEnoughPay      = []string{"notEnouphPay", "无法支付，不支持微信支付，提货券余额不足！"}
+	NotEnoughPay      = []string{"notEnouphPay", "无法支付，提货券余额不足！"}
 	NotRightPayWay    = []string{"notRightPayWay", "无法支付，该订单只支持微信支付"}
 	HasAlreadyPay     = []string{"hasAlreadyPay", "该订单已支付过"}
 	NotPayInTime      = []string{"notPayInTime", "没在规定时间内完成支付"}
-	PayWayNotAllow    = []string{"payWayNotAllow", "不支持该支付方式"}
+	PayWayNotAllow    = []string{"payWayNotAllow", "暂不支持微信支付！"}
 	PayNoAuthed       = []string{"payNoAuthed", "支付未授权"}
 	PhoneInvalid      = []string{"phoneInvalid", "手机号码格式不正确"}
 	PhoneExist        = []string{"phoneExist", "手机号码已被注册,请更换其他号码"}