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

饿百在发送运单取消事件后，如果订单没有及时（具体时间未知）转出自送，则订单会被取消，且不会发送订单取消事件

Browse Source
This commit is contained in:
gazebo
2019-11-29 16:28:21 +08:00
parent 5f4aa686d9
commit d93356ad01
3 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -300,19 +300,20 @@ func init() {
// 饿百转自送的时机不太清楚，暂时禁用超时转自送，在饿百运单取消时还是会自动创建
// 非自配送商家使用
order := savedOrderInfo.order
return savedOrderInfo.isDeliveryCompetition &&
model.IsOrderDeliveryByPlatform(order) &&
return order.VendorID != model.VendorIDEBAI &&
order.VendorID == bill.WaybillVendorID &&
order.VendorID != model.VendorIDEBAI &&
savedOrderInfo.isDeliveryCompetition &&
model.IsOrderDeliveryByPlatform(order) &&
order.DeliveryType != model.OrderDeliveryTypeSelfTake &&
isOrderCanSwitch2SelfDeliver(order)
isOrderCanSwitch2SelfDeliver(order) &&
(order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin)
},
},
//*
model.WaybillStatusCanceled: &StatusActionConfig{
StatusActionParams: partner.StatusActionParams{
TimerType: partner.TimerTypeBaseNow,
Timeout: 5 * time.Second,
Timeout: 1 * time.Second,
},
TimeoutAction: func(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) (err error) {
return sch.createWaybillOn3rdProviders(savedOrderInfo, ebaiCancelWaybillMaxFee, nil)
@@ -320,13 +321,13 @@ func init() {
ShouldSetTimer: func(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) bool {
order := savedOrderInfo.order
// 非自配送商家使用
return (order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) &&
savedOrderInfo.isDeliveryCompetition &&
return order.VendorID == model.VendorIDEBAI &&
order.VendorID == bill.WaybillVendorID &&
savedOrderInfo.isDeliveryCompetition &&
model.IsOrderDeliveryByPlatform(order) &&
order.VendorID == model.VendorIDEBAI &&
order.DeliveryType != model.OrderDeliveryTypeSelfTake &&
isOrderCanSwitch2SelfDeliver(order)
isOrderCanSwitch2SelfDeliver(order) &&
(order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin)
},
},
//*/