- 在取消运单相关操作时，反转订单状态至待配送

business/jxcallback/scheduler/basesch/basesch.go

@@ -55,7 +55,8 @@ func (c *BaseScheduler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool
 
 func (c *BaseScheduler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) {
 	globals.SugarLogger.Infof("Swtich2SelfDeliver orderID:%s", order.VendorOrderID)
-	if /*order.LockStatus == model.OrderStatusUnknown && */ order.Status == model.OrderStatusFinishedPickup {
+	if /*order.LockStatus == model.OrderStatusUnknown && */ (order.Status == model.OrderStatusFinishedPickup || order.Status == model.OrderStatusDelivering) &&
+		order.DeliveryFlag&model.OrderDeliveryFlagMaskPurcahseDisabled == 0 {
 		if c.IsReallyCallPlatformAPI {
 			err = utils.CallFuncLogErrorWithInfo(func() error {
 				return partner.GetPurchasePlatformFromVendorID(order.VendorID).Swtich2SelfDeliver(order, userName)

business/jxcallback/scheduler/defsch/defsch.go

@@ -390,7 +390,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 					s.resetTimer(savedOrderInfo, bill, isPending)
 					if !isPending {
 						bill.WaybillVendorID = model.VendorIDUnknown
-						s.updateOrderByBill(order, bill, false)
+						s.updateOrderByBill(order, bill, true)
 					}
 				} else if s.IsOrderHasWaybill(order) {
 					s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
@@ -412,7 +412,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 					if !isPending {
 						if s.IsOrderHasWaybill(order) {
 							bill.WaybillVendorID = model.VendorIDUnknown
-							s.updateOrderByBill(order, bill, false)
+							s.updateOrderByBill(order, bill, true)
 						}
 						// 3方的运单取消才会重新发起创建3方订单，购物平台的运单取消后，它本身还会再创建新运单(NewWaybill事件有相应TIMER))，至少京东是这样的，暂时按京东的行为来
 						// 现在发现饿百取消订单后不会再创建运单了，所以饿百运单取消也允许直接创建三方运单
@@ -821,7 +821,6 @@ func (s *DefScheduler) updateOrderByBill(order *model.GoodsOrder, bill *model.Wa
 	order.VendorWaybillID = bill.VendorWaybillID
 	if revertStatus {
 		order.Status = model.OrderStatusFinishedPickup
-		partner.CurOrderManager.UpdateOrderStatusAndFlag(order)
 	}
 }