liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
richboo111
2023-01-31 15:03:48 +08:00
parent b0c3afe698 16e8fd8412
commit 2b46f5965d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/scheduler/defsch/defsch_ext.go
View File

@@ -42,7 +42,8 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
if err = err2; err == nil { if err = err2; err == nil {
phone = storeDetail.Tel1 phone = storeDetail.Tel1
} }
err = s.SelfDeliverDelivering(order, phone) err = s.SelfDeliverDelivering(order, phone) // 取消平台自配送
s.CancelAll3rdWaybills(ctx, vendorOrderID, vendorID, true) // 取消三方平台配送以及调度
} }
} else { } else {
if order.Status < model.OrderStatusDelivering || (order.VendorID == model.VendorIDDD && order.Status < model.OrderStatusDelivering) { if order.Status < model.OrderStatusDelivering || (order.VendorID == model.VendorIDDD && order.Status < model.OrderStatusDelivering) {