|
|
@@ -35,12 +35,11 @@ var payOrder sync.Mutex
|
|
|
func (self *PayController) payExchange(oId, payWay, returnUrl, source, remark string, useCoupon bool) {
|
|
|
payOrder.Lock()
|
|
|
defer payOrder.Unlock()
|
|
|
- var payUrl, tel, addr, concat, specialstr string
|
|
|
+ var payUrl, tel, addr, concat string
|
|
|
var payData map[string]string
|
|
|
var specialPromotion bool
|
|
|
wxUId := self.GetCurrentWxUserId()
|
|
|
uId := self.GetCurrentUserId()
|
|
|
- specialPromotion, specialstr = sys_config.GetSpetialPromotion()
|
|
|
pick_dept_id, _ := self.GetInt64("pick_dept")
|
|
|
pick_way, _ := self.GetInt64("pick_way")
|
|
|
//地址
|
|
|
@@ -87,7 +86,7 @@ func (self *PayController) payExchange(oId, payWay, returnUrl, source, remark st
|
|
|
}
|
|
|
SaleNumsMap := make(map[int64]int64)
|
|
|
storeMap := make(map[int64]int64)
|
|
|
-
|
|
|
+ specialPromotion=order.SpecialPro
|
|
|
//支付方式判断
|
|
|
if order.OrderType == order_model.ORDER_TYPE_SHOP && payWay == pay_model.PAYWAY_BALANCE {
|
|
|
self.ReturnError(403, apps.NotRightPayWay, "", nil)
|
|
|
@@ -157,9 +156,6 @@ func (self *PayController) payExchange(oId, payWay, returnUrl, source, remark st
|
|
|
order.TotalPrice = total_price
|
|
|
order.PickDept = pick_dept_id
|
|
|
order.PickWay = pick_way
|
|
|
- if specialPromotion {
|
|
|
- order.Promotions = specialstr
|
|
|
- }
|
|
|
//第一次支付已更新支付方式,第一次支付才计算支付金额
|
|
|
if len(order.PayWay) <= 0 {
|
|
|
order.PayWay = payWay
|