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

1

Browse Source
This commit is contained in:
邹宗楠
2025-02-12 17:16:37 +08:00
parent dce30b03dc
commit 98e77a68cc
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,7 +266,6 @@ func (c *BaseScheduler) CancelWaybill(bill *model.Waybill, cancelReasonID int, c
if c.IsReallyCallPlatformAPI && bill.OrderVendorID != bill.WaybillVendorID && bill.Status != model.WaybillStatusCanceled {
if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil {
if err = utils.CallFuncLogErrorWithInfo(func() error {
globals.SugarLogger.Debugf("--------CancelWaybill:%s", utils.Format4Output(c.IsReallyCallPlatformAPI && bill.OrderVendorID != bill.WaybillVendorID && bill.Status != model.WaybillStatusCanceled, false))
if err := handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason+"9"); err != nil {
return err
}

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

@@ -1052,7 +1052,6 @@ func (s *DefScheduler) solutionJdsOrder(bill *model.Waybill) (err error) {
func (s *DefScheduler) cancelOtherWaybills(savedOrderInfo *WatchOrderInfo, bill2Keep *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
for _, v := range savedOrderInfo.waybills {
globals.SugarLogger.Debugf("----------cancelOtherWaybills- :%s", utils.Format4Output(v.Status < model.WaybillStatusEndBegin && !model.IsWaybillPlatformOwn(v) && (bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)), false))
if v.Status < model.WaybillStatusEndBegin && !model.IsWaybillPlatformOwn(v) && (bill2Keep == nil || !(v.WaybillVendorID == bill2Keep.WaybillVendorID && v.VendorWaybillID == bill2Keep.VendorWaybillID)) {
err2 := s.CancelWaybill(v, cancelReasonID, cancelReason)
if err2 == nil {

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

@@ -449,9 +449,19 @@ func (s *DefScheduler) CancelAll3rdWaybills(ctx *jxcontext.Context, vendorOrderI
err = func() (err error) {
// 取消三方运单,取消各平台单号信息,间隔一段时间后定时任务重新调度
savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true)
globals.SugarLogger.Debugf("-------------1 := %s", utils.Format4Output(savedOrderInfo != nil, false))
if savedOrderInfo != nil {
err = s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, ctx.GetUserName()+":18"+partner.CancelWaybillReasonStrActive)
if len(savedOrderInfo.waybills) == model.NO {
wayBills, err := dao.GetWayBillByOrderID(dao.GetDB(), 0, vendorID, 0, vendorOrderID)
if err == nil {
for _, wb := range wayBills {
if wb.Status < model.WaybillStatusDelivered {
err = s.CancelWaybill(wb, partner.CancelWaybillReasonOther, ctx.GetUserName()+":18"+partner.CancelWaybillReasonStrActive)
}
}
}
} else {
err = s.cancelOtherWaybills(savedOrderInfo, nil, partner.CancelWaybillReasonOther, ctx.GetUserName()+":18"+partner.CancelWaybillReasonStrActive)
}
} else {
err = scheduler.ErrCanNotFindOrder
}
@@ -466,7 +476,6 @@ func (s *DefScheduler) CancelAll3rdWaybills(ctx *jxcontext.Context, vendorOrderI
return err
}()
}, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID))
globals.SugarLogger.Debugf("-------------12222 := %v", err)
return err
}

2
business/partner/delivery/dada/waybill.go
View File

@@ -420,8 +420,6 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
default:
cancelReasonID = dadaapi.ReasonIDOther
}
key, appSecret, sourceID := api.DadaAPI.GetAppId()
globals.SugarLogger.Debugf("------------dada :=key: %s,appSecret :%s,sourceID :%s", key, appSecret, sourceID)
_, err = api.DadaAPI.CancelOrder(bill.VendorOrderID, cancelReasonID, cancelReason)
return err
}