|
|
@@ -45,9 +45,9 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
|
|
|
var addr string
|
|
|
pick_dept_id, _ := self.GetInt64("pick_dept")
|
|
|
pick_way, _ := self.GetInt64("pick_way")
|
|
|
+ //地址
|
|
|
+ addressId, _ := self.GetInt64("address_id")
|
|
|
if pick_way == order_model.PICK_EXPRESS {
|
|
|
- //地址
|
|
|
- addressId, _ := self.GetInt64("address_id")
|
|
|
address := address_model.GetUserAddressById(addressId)
|
|
|
//beego.BeeLogger.Warn("address.wxuserId--%d", address.WxUserId)
|
|
|
beego.BeeLogger.Warn("wxUId-%d", wxUId)
|
|
|
@@ -154,7 +154,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
|
|
|
|
|
|
//第一次支付已更新支付方式,第一次支付才计算支付金额
|
|
|
if len(order.PayWay) <= 0 {
|
|
|
-
|
|
|
+ order.AddressId = addressId
|
|
|
order.Remark = remark
|
|
|
order.PayWay = payWay
|
|
|
order.Contact = concat
|