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:29:28 +08:00
parent 38bb7f32dc
commit 743e70d759
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -287,7 +287,6 @@ 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 {

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

@@ -367,8 +367,6 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
return nil, err return nil, err
} }
globals.SugarLogger.Debugf("===========CallCreateWaybillPolicy=== := %d", maxDeliveryFee)
globals.SugarLogger.Debugf("===========waybillList[0].ActualFee=== := %d", waybillList[0].ActualFee)
// 检查两天内是否有订单 // 检查两天内是否有订单
var result *dadaapi.CreateOrderResponse var result *dadaapi.CreateOrderResponse
if len(waybillList) > 0 && waybillList[0].Status != model.WaybillStatusFailed { if len(waybillList) > 0 && waybillList[0].Status != model.WaybillStatusFailed {

3
business/partner/delivery/delivery.go
View File

@@ -21,6 +21,9 @@ const (
) )
func CallCreateWaybillPolicy(deliveryFee, maxDeliveryFee int64, order *model.GoodsOrder, waybillVendorID int) (err error) { func CallCreateWaybillPolicy(deliveryFee, maxDeliveryFee int64, order *model.GoodsOrder, waybillVendorID int) (err error) {
if maxDeliveryFee != model.NO {
return nil
}
if maxDeliveryFee <= model.DefMaxDeliveryFee { if maxDeliveryFee <= model.DefMaxDeliveryFee {
maxDeliveryFee = model.DefMaxDeliveryFee maxDeliveryFee = model.DefMaxDeliveryFee
} }