1

business/jxcallback/scheduler/basesch/basesch.go

@@ -135,7 +135,13 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName
 						return err
 					}
 				}
-
+				//抖音配送
+				if order.VendorID == model.VendorIDDD {
+					//取消抖音配送转自送
+					localBill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID)
+					err = c.CancelWaybill(localBill, partner.CancelWaybillReasonDYPSCancel, partner.CancelWaybillReasonStrDYPSCancel)
+					partner.CurOrderManager.OnOrderMsg(order, "取消抖音配送,转用门店自配送/三方配送", err.Error())
+				}
 				return err
 			}, "SelfDeliverDelivering orderID:%s", order.VendorOrderID)
 			if err == nil { // 因为有些平台设置配送中后，不会发送订单在配送中消息过来，所以成功后就强制设置状态为配送中

business/jxcallback/scheduler/defsch/defsch.go

@@ -1020,15 +1020,6 @@ func (s *DefScheduler) solutionJdsOrder(bill *model.Waybill) (err error) {
 }
 
 func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2Keep *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
-	//特殊处理抖音运力取消
-	if savedOrderInfo.order.VendorID == model.VendorIDDD {
-		savedOrderInfo.waybills[0] = &model.Waybill{
-			VendorOrderID:   savedOrderInfo.order.VendorOrderID,
-			VendorWaybillID: savedOrderInfo.order.VendorWaybillID,
-			WaybillVendorID: model.VendorIDDD,
-			OrderVendorID:   model.VendorIDDD,
-		}
-	}
 	for _, v := range savedOrderInfo.waybills {
 		if v.Status < model.WaybillStatusEndBegin &&
 			!model.IsWaybillPlatformOwn(v) &&

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -157,7 +157,6 @@ func (s *DefScheduler) CreateWaybillOnProviders4SavedOrder(ctx *jxcontext.Contex
 		if bills, err = s.CreateWaybillOnProviders(ctx, order, courierVendorIDs, excludeCourierVendorIDs, maxDeliveryFee, forceCreate); err == nil {
 			if forceCreate {
 				order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled
-				globals.SugarLogger.Debugf("order.DeliveryFlag============%d,order.Status===========%d", order.DeliveryFlag, order.Status)
 				err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order)
 			}
 			if err == nil {