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

dyps cancelwaybill

Browse Source
This commit is contained in:
richboo111
2022-12-29 18:14:55 +08:00
parent acd05db63c
commit 1bbebdb773
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1005,6 +1005,15 @@ func (s *DefScheduler) solutionJdsOrder(bill *model.Waybill) (err error) {
}
func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2Keep *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
//特殊处理抖音运力取消
if savedOrderInfo.order.VendorID == model.VendorIDDD {
savedOrderInfo.waybills[0] = &model.Waybill{
VendorOrderID: savedOrderInfo.order.VendorOrderID,
VendorWaybillID: savedOrderInfo.order.VendorWaybillID,
WaybillVendorID: model.VendorIDDYPS,
OrderVendorID: model.VendorIDDD,
}
}
for _, v := range savedOrderInfo.waybills {
if v.Status < model.WaybillStatusEndBegin &&
!model.IsWaybillPlatformOwn(v) &&

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

@@ -418,10 +418,6 @@ func (s *DefScheduler) CancelAll3rdWaybills(ctx *jxcontext.Context, vendorOrderI
err = func() (err error) {
// 取消三方运单,取消各平台单号信息,间隔一段时间后定时任务重新调度
savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true)
if vendorID == model.VendorIDDD {
globals.SugarLogger.Debugf("CancelAll3rdWaybills vendorOrderID=%s vendorID=%d", vendorOrderID, vendorID)
globals.SugarLogger.Debugf("CancelAll3rdWaybills savedOrderInfo=%s", utils.Format4Output(savedOrderInfo, false))
}
if savedOrderInfo != nil {
err = s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
} else {