|
@@ -624,6 +624,7 @@ func FindMaxPaymentMethod(total_weixin, totalCoupon, paiedCash int64) string {
|
|
|
|
|
|
|
|
type PaymentDetails struct {
|
|
type PaymentDetails struct {
|
|
|
FirstPay bool // 是否首次支付
|
|
FirstPay bool // 是否首次支付
|
|
|
|
|
+ OrderLimit int64 // 免运费订单金额
|
|
|
TotalPrice int64 // 订单总金额
|
|
TotalPrice int64 // 订单总金额
|
|
|
Freight int64 // 运费
|
|
Freight int64 // 运费
|
|
|
PaySilver int64 // 用银币支付的金额
|
|
PaySilver int64 // 用银币支付的金额
|
|
@@ -689,10 +690,11 @@ func (self *PayController) QueryPayInfo() {
|
|
|
|
|
|
|
|
//运费
|
|
//运费
|
|
|
freight := sys_config.GetFreight()
|
|
freight := sys_config.GetFreight()
|
|
|
|
|
+ orderLimt := sys_config.GetOrderLimit()
|
|
|
//第一次支付已更新支付方式，第一次支付才计算支付金额
|
|
//第一次支付已更新支付方式，第一次支付才计算支付金额
|
|
|
if len(order.PayWay) <= 0 {
|
|
if len(order.PayWay) <= 0 {
|
|
|
//计算运费
|
|
//计算运费
|
|
|
- if total_price >= sys_config.GetOrderLimit() || pickWay == order_model.PICK_SHOP {
|
|
|
|
|
|
|
+ if total_price >= orderLimt || pickWay == order_model.PICK_SHOP {
|
|
|
freight = int64(0)
|
|
freight = int64(0)
|
|
|
}
|
|
}
|
|
|
tp := total_price
|
|
tp := total_price
|
|
@@ -748,6 +750,7 @@ func (self *PayController) QueryPayInfo() {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
details.FirstPay = firstPay
|
|
details.FirstPay = firstPay
|
|
|
|
|
+ details.OrderLimit = orderLimt
|
|
|
details.Freight = freight
|
|
details.Freight = freight
|
|
|
details.TotalPrice = total_price
|
|
details.TotalPrice = total_price
|
|
|
details.PayBalance = paiedCash
|
|
details.PayBalance = paiedCash
|
