abiao 1 anno fa
parent
commit
ca7a8d7adc

+ 2 - 1
go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_controller.go

@@ -30,6 +30,7 @@ func (self *PayController) Pay() {
 
 	source := self.GetString("s")
 	useCoupon, _ := self.GetBool("use_coupon", false)
+	useBalance, _ := self.GetBool("use_balance", false)
 
 	beego.BeeLogger.Debug("pay.oId(%s).payway(%s).(%v).use_coupon(%t)", oId, payWay, payWay == balance_model.PAY_WAY_TYPE_RECHARGE_WXPAY, useCoupon)
 	if oId == "" || payWay == "" {
@@ -54,7 +55,7 @@ func (self *PayController) Pay() {
 		order := order_model.GetOrderById(oId, false)
 
 		if order != nil && order.OrderType != order_model.ORDER_TYPE_CENT {
-			self.payExchange(oId, payWay, returnUrl, source, remark, useCoupon)
+			self.payExchange(oId, payWay, returnUrl, source, remark, useCoupon, useBalance)
 		} else {
 			self.payCentExchange(oId, returnUrl, source, remark)
 		}

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

@@ -30,7 +30,7 @@ var createDrawCode sync.Mutex
 var payOrder sync.Mutex
 
 // 支付订单
-func (self *PayController) payExchange(oId, payWay, returnUrl, source, remark string, useCoupon bool) {
+func (self *PayController) payExchange(oId, payWay, returnUrl, source, remark string, useCoupon, useBalance bool) {
 	payOrder.Lock()
 	defer payOrder.Unlock()
 	var payUrl, tel, addr, concat, allowAddr, allowPro string
@@ -258,7 +258,7 @@ func (self *PayController) payExchange(oId, payWay, returnUrl, source, remark st
 		//抵扣佣金
 		paiedCash := int64(0)
 		userLeftBalanceCash := balance_model.GetCashTotalBalance(wxUId)
-		if userLeftBalanceCash > int64(0) {
+		if userLeftBalanceCash > int64(0) && useBalance {
 			if userLeftBalanceCash < total_weixin && total_weixin > 0 {
 				paiedCash = userLeftBalanceCash
 			} else {