Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

business/jxcallback/scheduler/defsch/defsch.go

@@ -1084,11 +1084,12 @@ func (s *DefScheduler) loadSavedOrderFromMap(status *model.OrderStatus, isForceL
 	var realSavedInfo *WatchOrderInfo
 	if savedInfo, ok := s.orderMap.Load(universalOrderID); ok {
 		realSavedInfo = savedInfo.(*WatchOrderInfo)
-
+		globals.SugarLogger.Debugf("loadSavedOrderFromMap savedInfo=%s", utils.Format4Output(savedInfo, false))
 	} else {
 		realSavedInfo = NewWatchOrderInfo(nil)
 		s.orderMap.StoreWithTimeout(universalOrderID, realSavedInfo, orderMapStoreMaxTime)
 	}
+
 	if isForceLoad {
 		if order, err := partner.CurOrderManager.LoadOrder(status.RefVendorOrderID, status.RefVendorID); err == nil {
 			realSavedInfo.SetOrder(order)

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -418,6 +418,9 @@ func (s *DefScheduler) CancelAll3rdWaybills(ctx *jxcontext.Context, vendorOrderI
 		err = func() (err error) {
 			// 取消三方运单,取消各平台单号信息,间隔一段时间后定时任务重新调度
 			savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true)
+			if vendorID == model.VendorIDDD {
+				globals.SugarLogger.Debugf("CancelAll3rdWaybills savedOrderInfo=%s", utils.Format4Output(savedOrderInfo, false))
+			}
 			if savedOrderInfo != nil {
 				err = s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
 			} else {

business/partner/delivery/tiktok_store/waybill.go

@@ -110,9 +110,11 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
 }
 
 func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
+	globals.SugarLogger.Debugf("进入DYPS CancelWaybill")
 	if localOrder, _, err := dao.GetOrders(dao.GetDB(), []int64{utils.Str2Int64(bill.VendorOrderID)}, false, false, "", "", false, []int{0}, false, "", nil, 0, 0); err != nil {
 		return errors.New("取消运单时，获取平台门店ID失败，请重试")
 	} else {
+		globals.SugarLogger.Debugf("localOrder=%s", utils.Format4Output(localOrder, false))
 		if err = getAPI(bill.VendorOrgCode).ShopOrderDispatcher(utils.Str2Int64(localOrder[0].VendorStoreID), bill.VendorOrderID, tiktok_api.DispatcherFeeTypeCancel); err != nil {
 			globals.SugarLogger.Debugf("抖音配送取消运力失败:%v", err)
 			return fmt.Errorf("抖音配送取消运力失败:%v", err)