|
|
@@ -222,15 +222,15 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
|
|
|
self.Data["json"] = &PayData{NeedWx: true, PayData: payData}
|
|
|
|
|
|
} else if order.Source == order_model.SOURCE_APP {
|
|
|
- freight := base_config.GetFreight()
|
|
|
- if order.TotalPrice >= base_config.GetOrderLimit() {
|
|
|
+ freight := sys_config.GetFreight()
|
|
|
+ if order.TotalPrice >= sys_config.GetOrderLimit() {
|
|
|
freight = int64(0)
|
|
|
}
|
|
|
order.TotalPrice += freight
|
|
|
notifyUrl := fmt.Sprintf("%s/v1/pay/%s/async/%s", beego.AppConfig.String("ApiHost"), EXCHANGE_TARGET, pay_model.PAYWAY_WEIXINPAY)
|
|
|
body := fmt.Sprintf("FOHOW玖玖-购买商品")
|
|
|
//获取paycode
|
|
|
- payCode := pay_model.GetPayConfigByDepart(wxUser.Depart, true)
|
|
|
+ payCode := sys_config.GetPayConfigByDepart(wxUser.Depart, true)
|
|
|
payData := wx_mp.GetAppPayData(order.OrderId, order.PaiedPrice, body, notifyUrl, self.Ctx.Input.IP(), payCode)
|
|
|
|
|
|
//返回数据
|
