1

business/partner/delivery/delivery.go

@@ -18,13 +18,11 @@ const (
 	warningWeight   = 50 * 1000 // 克
 	// maxDiffFee2Mtps = 200       // 与美团配送最多差价
 	// maxAddFee       = 200       // 最大增加费用，单位为分，超过不发三方配送了
-	defMaxDeliveryFee = 10000 // 创建运单最高价
-	alarmFee          = 1500  // 配送费报警阈值
 )
 
 func CallCreateWaybillPolicy(deliveryFee, maxDeliveryFee int64, order *model.GoodsOrder, waybillVendorID int) (err error) {
-	if maxDeliveryFee <= 0 || maxDeliveryFee > defMaxDeliveryFee {
-		maxDeliveryFee = defMaxDeliveryFee
+	if maxDeliveryFee <= 0 || maxDeliveryFee > model.DefMaxDeliveryFee {
+		maxDeliveryFee = model.DefMaxDeliveryFee
 	}
 	if deliveryFee > maxDeliveryFee {
 		errStr := fmt.Sprintf("超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(deliveryFee), jxutils.IntPrice2StandardCurrencyString(maxDeliveryFee))
@@ -139,8 +137,8 @@ func CalculateBillDeliveryFee(bill *model.Waybill) (deliveryFee, addFee int64) {
 // 日志提示检查订单运费
 func OnWaybillCreated(waybill *model.Waybill) {
 	deliveryFee := int64(math.Max(float64(waybill.DesiredFee), float64(waybill.ActualFee)))
-	if deliveryFee > alarmFee {
+	if deliveryFee > model.AlarmFee {
 		globals.SugarLogger.Infof("[运营]%s订单, orderID:%s, 成功创建%s运单:%s, 配送费:%s太高(大于%s),请知悉!", model.VendorChineseNames[waybill.OrderVendorID], waybill.VendorOrderID,
-			model.VendorChineseNames[waybill.WaybillVendorID], waybill.VendorWaybillID, jxutils.IntPrice2StandardCurrencyString(deliveryFee), jxutils.IntPrice2StandardCurrencyString(alarmFee))
+			model.VendorChineseNames[waybill.WaybillVendorID], waybill.VendorWaybillID, jxutils.IntPrice2StandardCurrencyString(deliveryFee), jxutils.IntPrice2StandardCurrencyString(model.AlarmFee))
 	}
 }