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

2023-01-31 15:03:48 +08:00
parent b0c3afe698 16e8fd8412
commit 2b46f5965d
1 changed files with 2 additions and 1 deletions
--- a/business/jxcallback/scheduler/defsch/defsch_ext.go
+++ b/business/jxcallback/scheduler/defsch/defsch_ext.go
@@ -42,7 +42,8 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
 								if err = err2; err == nil {
 									phone = storeDetail.Tel1
 								}
-								err = s.SelfDeliverDelivering(order, phone)
+								err = s.SelfDeliverDelivering(order, phone)                // 取消平台自配送
+								s.CancelAll3rdWaybills(ctx, vendorOrderID, vendorID, true) // 取消三方平台配送以及调度
 							}
 						} else {
 							if order.Status < model.OrderStatusDelivering || (order.VendorID == model.VendorIDDD && order.Status < model.OrderStatusDelivering) {