|
|
@@ -43,7 +43,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
|
|
|
var concat string
|
|
|
var tel string
|
|
|
var addr string
|
|
|
- pick_dept, _ := self.GetInt64("pick_dept")
|
|
|
+ pick_dept_id, _ := self.GetInt64("pick_dept")
|
|
|
pick_way, _ := self.GetInt64("pick_way")
|
|
|
if pick_way == order_model.PICK_EXPRESS {
|
|
|
//地址
|
|
|
@@ -63,7 +63,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
|
|
|
//物流方式
|
|
|
pick_addr_id, _ := self.GetInt64("pick_addr_id")
|
|
|
pick_address := address_model.GetUserPickAddressById(pick_addr_id)
|
|
|
- pick_dept := user_model.GetDepartRecordById(pick_dept, true)
|
|
|
+ pick_dept := user_model.GetDepartRecordById(pick_dept_id, true)
|
|
|
if pick_dept == nil || pick_address == nil || pick_address.WxUserId != wxUId {
|
|
|
self.ReturnError(403, apps.AddressNotMatch, "", nil)
|
|
|
}
|
|
|
@@ -193,7 +193,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
|
|
|
}
|
|
|
}
|
|
|
order.Freight = freight
|
|
|
- order.PickDept = pick_dept
|
|
|
+ order.PickDept = pick_dept_id
|
|
|
order.PickWay = pick_way
|
|
|
//先扣减提货券
|
|
|
if totalCoupon > 0 {
|
