From ca62a02bdd387c0fe9819169c0e1007865739e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 9 Mar 2022 15:21:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BE=8E=E5=9B=A2=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E8=AE=A2=E5=8D=95=E4=BB=A5=E5=8F=8A=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=98=AF=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E4=BD=93=E4=B8=8D=E4=B8=80=E8=87=B4,?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=E9=94=99?= =?UTF-8?q?=E8=AF=AF,=E4=BF=AE=E6=94=B9=E9=A2=84=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E6=98=AF,shopId=E4=BC=A0=E5=85=A5=E9=94=99=E8=AF=AF,=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=89=93=E6=A1=A9=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/basesch/basesch.go | 1 - business/jxcallback/scheduler/defsch/defsch.go | 13 ------------- business/partner/delivery/mtps/waybill.go | 3 --- 3 files changed, 17 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index 00e25c435..1d754d9ac 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -200,7 +200,6 @@ func (c *BaseScheduler) CancelWaybill(bill *model.Waybill, cancelReasonID int, c if c.IsReallyCallPlatformAPI && bill.OrderVendorID != bill.WaybillVendorID && bill.Status != model.WaybillStatusCanceled { if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil { if err = utils.CallFuncLogErrorWithInfo(func() error { - globals.SugarLogger.Info("开始美团配送订单取消:====================", handlerInfo.Handler) return handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason) }, "CancelWaybill bill:%v", bill); err == nil { bill.Status = model.WaybillStatusCanceled diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index c173aa3ea..72bfb8252 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -960,9 +960,7 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2 cc && (bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) { - globals.SugarLogger.Info("===========================================1") err2 := s.CancelWaybill(v, cancelReasonID, cancelReason) - globals.SugarLogger.Info("===========================================2", err2) if err2 == nil { // 在这里就从map里删除，而不是等收到运单结束事件才删除，可避免不必要的重复取消（第二次取消还会失败） s.removeWaybillFromMap(savedOrderInfo, v.WaybillVendorID) @@ -975,7 +973,6 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2 } } } - globals.SugarLogger.Info("===========================================3", err) return err } @@ -1051,16 +1048,6 @@ func (s *DefScheduler) loadSavedOrderFromMap(status *model.OrderStatus, isForceL globals.SugarLogger.Infof("loadSavedOrderFromMap can not load order orderID:%s with error:%v", status.RefVendorOrderID, err) } } - - gg := len(realSavedInfo.waybills) - globals.SugarLogger.Info("=================gg", gg) - for _, v := range realSavedInfo.waybills { - globals.SugarLogger.Info("=================gg", v.ID) - globals.SugarLogger.Info("=================gg", v.VendorOrderID) - globals.SugarLogger.Info("=================gg", v.Status) - globals.SugarLogger.Info("=================gg", v.DesiredFee) - } - return realSavedInfo } diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 983853750..99f71f117 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -335,14 +335,11 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, if err != nil { return err } - globals.SugarLogger.Info("===========================================order", order) - globals.SugarLogger.Info("===========================================bill", bill) cancelReasonID = mtpsapi.CancelReasonMerchantOther if cancelReason == "" { cancelReason = "顾客主动取消" } _, err = api.MtpsAPI.CancelOrder(order.ID+1000000, bill.VendorWaybillID, cancelReasonID, cancelReason) - globals.SugarLogger.Info("===========================================order-err", err) return err }