From 743e70d759267efaef07cebd1458329f0817d4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 22 Jan 2024 18:29:28 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/defsch/defsch_ext.go | 1 - business/partner/delivery/dada/waybill.go | 2 -- business/partner/delivery/delivery.go | 3 +++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 32a060840..f719bc95f 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -287,7 +287,6 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor return nil, errCode, err } } - globals.SugarLogger.Debugf("============maxDeliveryFee := %d", maxDeliveryFee) excludeCourierVendorIDs := make([]int, 0, 0) allDelivery := map[int]int{model.VendorIDFengNiao: 1, model.VendorIDDada: 1, model.VendorIDMTPS: 1, model.VendorIDUUPT: 1, model.VendorIDSFPS: 1} for _, v := range courierVendorIDs { diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 79737e61c..8294b1b88 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -367,8 +367,6 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee return nil, err } - globals.SugarLogger.Debugf("===========CallCreateWaybillPolicy=== := %d", maxDeliveryFee) - globals.SugarLogger.Debugf("===========waybillList[0].ActualFee=== := %d", waybillList[0].ActualFee) // 检查两天内是否有订单 var result *dadaapi.CreateOrderResponse if len(waybillList) > 0 && waybillList[0].Status != model.WaybillStatusFailed { diff --git a/business/partner/delivery/delivery.go b/business/partner/delivery/delivery.go index c29b87d75..2dc292312 100644 --- a/business/partner/delivery/delivery.go +++ b/business/partner/delivery/delivery.go @@ -21,6 +21,9 @@ const ( ) func CallCreateWaybillPolicy(deliveryFee, maxDeliveryFee int64, order *model.GoodsOrder, waybillVendorID int) (err error) { + if maxDeliveryFee != model.NO { + return nil + } if maxDeliveryFee <= model.DefMaxDeliveryFee { maxDeliveryFee = model.DefMaxDeliveryFee }