添加打桩

business/jxcallback/scheduler/basesch/basesch.go

@@ -200,6 +200,7 @@ 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

business/jxcallback/scheduler/defsch/defsch.go

@@ -958,7 +958,9 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
 		if v.Status < model.WaybillStatusEndBegin &&
 			!model.IsWaybillPlatformOwn(v) &&
 			(bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) {
+			globals.SugarLogger.Info("===========================================1")
 			err2 := s.CancelWaybill(v, cancelReasonID, cancelReason)
+			globals.SugarLogger.Info("===========================================2", err)
 			if err2 == nil {
 				// 在这里就从map里删除，而不是等收到运单结束事件才删除，可避免不必要的重复取消（第二次取消还会失败）
 				s.removeWaybillFromMap(savedOrderInfo, v.WaybillVendorID)
@@ -971,6 +973,7 @@ func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2
 			}
 		}
 	}
+	globals.SugarLogger.Info("===========================================3", err)
 	return err
 }
 

business/partner/delivery/mtps/waybill.go

@@ -335,7 +335,6 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
 		cancelReason = "顾客主动取消"
 	}
 	_, err = api.MtpsAPI.CancelOrder(order.ID+1000000, bill.VendorWaybillID, cancelReasonID, cancelReason)
-	globals.SugarLogger.Info("取消美团订单错误:================", err)
 	return err
 }