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-02-03 16:52:22 +08:00
parent fb6dfdf292 c3221e443d
commit 12b4202fee
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxcallback/scheduler/basesch/basesch.go
View File

@@ -143,7 +143,11 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName
}
// 先转自送,自送不成功取消平台配送.
if err = partner.GetPurchasePlatformFromVendorID(order.VendorID).CancelLogisticsByWmOrderId(order, "", "", order.VendorStoreID, order.VendorOrderID); err != nil {
if tiktokWayBillStatus == -1 {
if err := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivering(order, userName); err != nil {
partner.CurOrderManager.OnOrderMsg(order, "抖音转自送,平台无运力", "tiktokWayBillStatus = -1")
}
} else if err = partner.GetPurchasePlatformFromVendorID(order.VendorID).CancelLogisticsByWmOrderId(order, "", "", order.VendorStoreID, order.VendorOrderID); err != nil {
err = c.CancelWaybill(localBill, partner.CancelWaybillReasonDYPSCancel, partner.CancelWaybillReasonStrDYPSCancel)
partner.CurOrderManager.OnOrderMsg(order, "取消抖音平台运单错误,无法转自送", err.Error())
return err

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

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