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:
邹宗楠
2024-01-22 18:22:38 +08:00
parent 2f41887ff6
commit 52d575e5d5
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -287,6 +287,7 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
return nil, errCode, err return nil, errCode, err
} }
} }
globals.SugarLogger.Debugf("============maxDeliveryFee := %d", maxDeliveryFee)
excludeCourierVendorIDs := make([]int, 0, 0) excludeCourierVendorIDs := make([]int, 0, 0)
allDelivery := map[int]int{model.VendorIDFengNiao: 1, model.VendorIDDada: 1, model.VendorIDMTPS: 1, model.VendorIDUUPT: 1, model.VendorIDSFPS: 1} allDelivery := map[int]int{model.VendorIDFengNiao: 1, model.VendorIDDada: 1, model.VendorIDMTPS: 1, model.VendorIDUUPT: 1, model.VendorIDSFPS: 1}
for _, v := range courierVendorIDs { for _, v := range courierVendorIDs {
@@ -297,7 +298,6 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
for k, _ := range allDelivery { for k, _ := range allDelivery {
excludeCourierVendorIDs = append(excludeCourierVendorIDs, k) excludeCourierVendorIDs = append(excludeCourierVendorIDs, k)
} }
globals.SugarLogger.Debugf("===========")
billFunc := func() { billFunc := func() {
bills, err = func() (bills []*model.Waybill, err error) { bills, err = func() (bills []*model.Waybill, err error) {

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

@@ -394,6 +394,7 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
return nil, err return nil, err
} }
} }
if result == nil { if result == nil {
return nil, errors.New("达达配送,平台调用错误,无订单数据返回") return nil, errors.New("达达配送,平台调用错误,无订单数据返回")
} }