From b7c1e8638b49e9beaf269809119cd0cb71f9dc7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 16 May 2023 16:12:09 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/order.go | 2 +- business/jxcallback/scheduler/defsch/defsch_ext.go | 3 +-- business/partner/delivery/dada/waybill.go | 5 ++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 44c43d772..4757addeb 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -484,7 +484,7 @@ func ResetCreateWaybillFee(db *dao.DaoDB, order *model.GoodsOrder, bill *model.W globals.SugarLogger.Errorf("InsertStoreAcctIncomeAndUpdateStoreAcctBalance 483 : %v", err) } } - if store != nil && store.CreateDeliveryType == model.NO { + if store != nil && store.CreateDeliveryType == model.NO && deductFee != model.NO { err = partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, store.BrandID, int(deductFee), model.BrandBillTypeExpend, model.BrandBillFeeTypeDeductFee, order.VendorOrderID, order.VendorWaybillID) if err != nil { globals.SugarLogger.Errorf("InsertBrandBill 489 : %v", err) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index d4466cd9f..b47ec0e50 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -506,7 +506,6 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor if savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, false); savedOrderInfo != nil { timeoutSecond = savedOrderInfo.GetCreateWaybillTimeout() } - globals.SugarLogger.Debugf("==============storeCourierList := %s", utils.Format4Output(storeCourierList, false)) for _, storeCourier := range storeCourierList { var feeInfo *partner.WaybillFeeInfo if waybillMap[storeCourier.VendorID] != nil { @@ -531,7 +530,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor } else { feeInfo.DeliveryFee += model.WayBillDeliveryMarkUp // 加收两毛 feeInfo.TimeoutSecond = timeoutSecond - globals.SugarLogger.Debugf("==============GetWaybillFee := %s", utils.Format4Output(feeInfo, false)) + globals.SugarLogger.Debugf("预下单加价==============GetWaybillFee := %s", utils.Format4Output(feeInfo, false)) } } else { feeInfo = &partner.WaybillFeeInfo{ diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index a4cf28ac0..4663dc914 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -282,7 +282,7 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf if result, err = api.DadaAPI.QueryDeliverFee(billParams); err != nil { return nil, err } - globals.SugarLogger.Debugf("QueryDeliverFee===============:%s", utils.Format4Output(result, false)) + globals.SugarLogger.Debugf("QueryDeliverFee===============预下单获取配送费:%s", utils.Format4Output(result, false)) deliveryFeeInfo.DeliveryFee = jxutils.StandardPrice2Int(result.Fee) deliveryFeeInfo.RefDeliveryFee = deliveryFeeInfo.DeliveryFee } @@ -359,6 +359,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee } // 重新发送订单 result, err = api.DadaAPI.ReaddOrder(billParams) + globals.SugarLogger.Debugf("重新发送订单多次发单======== := %s", utils.Format4Output(result, false)) if err != nil { return nil, err } @@ -368,6 +369,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee if result, err = api.DadaAPI.QueryDeliverFee(billParams); err != nil { return nil, err } + globals.SugarLogger.Debugf("查询达达订单费用(第一次发单)======== := %s", utils.Format4Output(result, false)) // 阀值警报 if err = delivery.CallCreateWaybillPolicy(jxutils.StandardPrice2Int(result.Fee), maxDeliveryFee, order, model.VendorIDDada); err != nil { return nil, err @@ -376,6 +378,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee if err = api.DadaAPI.AddOrderAfterQuery(result.DeliveryNo); err != nil { return nil, err } + globals.SugarLogger.Debugf("重新发送订单======== := %s", utils.Format4Output(result, false)) } if result == nil { return nil, errors.New("达达配送,平台调用错误,无订单数据返回")