更新支付

go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_exchange_controller.go

@@ -212,6 +212,11 @@ func (self *PayController) payExchange(oId, payWay, returnUrl, source, remark st
 			self.ReturnError(403, apps.NotUnPay, "", nil)
 		}
 
+		freight := sys_config.GetFreight()
+		if order.TotalPrice >= sys_config.GetOrderLimit() || pick_way == order_model.PICK_SHOP {
+			freight = int64(0)
+		}
+
 		tp := order.TotalPrice
 
 		needWx := false
@@ -231,10 +236,7 @@ func (self *PayController) payExchange(oId, payWay, returnUrl, source, remark st
 		//若账户有提货券则优先抵扣提货券
 		totalCoupon := int64(0)
 		userLeftBalanceCount := balance_model.GetUserTotalBalance(wxUId)
-		freight := sys_config.GetFreight()
-		if tp >= sys_config.GetOrderLimit() || pick_way == order_model.PICK_SHOP {
-			freight = int64(0)
-		}
+
 		tp += freight
 		total_quan += freight