|
@@ -32,7 +32,7 @@ var createDrawCode sync.Mutex
|
|
|
var payOrder sync.Mutex
|
|
var payOrder sync.Mutex
|
|
|
|
|
|
|
|
//支付订单
|
|
//支付订单
|
|
|
-func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source string, useCoupon bool) {
|
|
|
|
|
|
|
+func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source, remark string, useCoupon bool) {
|
|
|
payOrder.Lock()
|
|
payOrder.Lock()
|
|
|
defer payOrder.Unlock()
|
|
defer payOrder.Unlock()
|
|
|
var payUrl string
|
|
var payUrl string
|
|
@@ -113,7 +113,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source s
|
|
|
total_price += product.Price * item.Count
|
|
total_price += product.Price * item.Count
|
|
|
SaleNumsMap[product.Id] = item.Count
|
|
SaleNumsMap[product.Id] = item.Count
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ order.Remark = remark
|
|
|
order.PayWay = payWay
|
|
order.PayWay = payWay
|
|
|
order.Contact = address.Contact
|
|
order.Contact = address.Contact
|
|
|
order.Tel = address.Tel
|
|
order.Tel = address.Tel
|
|
@@ -267,7 +267,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source s
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//支付积分订单
|
|
//支付积分订单
|
|
|
-func (self *PayController) payCentExchange(oId, returnUrl, source string) {
|
|
|
|
|
|
|
+func (self *PayController) payCentExchange(oId, returnUrl, source, remark string) {
|
|
|
payOrder.Lock()
|
|
payOrder.Lock()
|
|
|
defer payOrder.Unlock()
|
|
defer payOrder.Unlock()
|
|
|
var payUrl string
|
|
var payUrl string
|
|
@@ -296,7 +296,6 @@ func (self *PayController) payCentExchange(oId, returnUrl, source string) {
|
|
|
self.ReturnError(403, apps.NotUnPay, "", nil)
|
|
self.ReturnError(403, apps.NotUnPay, "", nil)
|
|
|
}
|
|
}
|
|
|
SaleNumsMap := make(map[int64]int64)
|
|
SaleNumsMap := make(map[int64]int64)
|
|
|
-
|
|
|
|
|
//获取购物商品明细
|
|
//获取购物商品明细
|
|
|
buy_price_total := int64(0)
|
|
buy_price_total := int64(0)
|
|
|
total_price := int64(0)
|
|
total_price := int64(0)
|
|
@@ -332,7 +331,7 @@ func (self *PayController) payCentExchange(oId, returnUrl, source string) {
|
|
|
total_price += product.Price * item.Count
|
|
total_price += product.Price * item.Count
|
|
|
SaleNumsMap[product.Id] = item.Count
|
|
SaleNumsMap[product.Id] = item.Count
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ order.Remark = remark
|
|
|
order.PayWay = order_model.PAY_WAY_CENT
|
|
order.PayWay = order_model.PAY_WAY_CENT
|
|
|
order.Contact = address.Contact
|
|
order.Contact = address.Contact
|
|
|
order.Tel = address.Tel
|
|
order.Tel = address.Tel
|