|
|
@@ -32,17 +32,15 @@ var createDrawCode sync.Mutex
|
|
|
var payOrder sync.Mutex
|
|
|
|
|
|
//支付订单
|
|
|
-func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source, remark string, useCoupon bool) {
|
|
|
+func (self *PayController) payExchange(oId, payWay, returnUrl, source, remark string, useCoupon bool) {
|
|
|
payOrder.Lock()
|
|
|
defer payOrder.Unlock()
|
|
|
- var payUrl string
|
|
|
+ var payUrl, tel, addr, concat, specialstr string
|
|
|
var payData map[string]string
|
|
|
+ var specialPromotion bool
|
|
|
wxUId := self.GetCurrentWxUserId()
|
|
|
uId := self.GetCurrentUserId()
|
|
|
-
|
|
|
- var concat string
|
|
|
- var tel string
|
|
|
- var addr string
|
|
|
+ specialPromotion, specialstr = sys_config.GetSpetialPromotion()
|
|
|
pick_dept_id, _ := self.GetInt64("pick_dept")
|
|
|
pick_way, _ := self.GetInt64("pick_way")
|
|
|
//地址
|
|
|
@@ -137,7 +135,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
|
|
|
}
|
|
|
}
|
|
|
//微信支付金额统计
|
|
|
- if product.Pv >= product.Price {
|
|
|
+ if product.Pv >= product.Price || specialPromotion {
|
|
|
total_quan += product.Price * item.Count
|
|
|
}
|
|
|
total_price += product.Price * item.Count
|
|
|
@@ -159,6 +157,9 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
|
|
|
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
|