双十二促销

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

@@ -194,27 +194,20 @@ 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 {
-				self.ReturnError(403, apps.NotEnoughPay, "", nil)
-			}
 			if userLeftBalanceCount < total_quan {
 				totalCoupon = userLeftBalanceCount
 			} else {
 				totalCoupon = total_quan
 			}
 		}
-		//特殊促销关闭微信支付
-		if sys_config.GetShutWechatPromotion() {
-			total_weixin = 0
-		} else {
-			total_weixin = tp - totalCoupon
+		total_weixin = tp - totalCoupon
+
+		//特殊促销期间券不够不允许支付
+		if sys_config.GetShutWechatPromotion() && total_weixin > 0 {
+			self.ReturnError(403, apps.NotEnoughPay, "", nil)
 		}
+
 		if total_weixin > 0 {
 			needWx = true
 		}

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

@@ -119,7 +119,7 @@ var (
 	NotUnPay            = []string{"notUnPay", "无法支付，该订单已支付或者已过期"}
 	NotPayWayTime       = []string{"notPayWayTime", "无法支付，促销期间只允许提货券支付"}
 
-	NotEnoughPay      = []string{"notEnouphPay", "无法支付，提货券余额不足"}
+	NotEnoughPay      = []string{"notEnouphPay", "无法支付，不支持微信支付，提货券余额不足！"}
 	NotRightPayWay    = []string{"notRightPayWay", "无法支付，该订单只支持微信支付"}
 	HasAlreadyPay     = []string{"hasAlreadyPay", "该订单已支付过"}
 	NotPayInTime      = []string{"notPayInTime", "没在规定时间内完成支付"}