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

waybill

Browse Source
This commit is contained in:
richboo111
2022-11-14 16:26:31 +08:00
parent 91f07e2904
commit 92c250e512
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -442,6 +442,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
deliveryFeeMap, err = func() (deliveryFeeMap map[int]*partner.WaybillFeeInfo, err error) {
db := dao.GetDB()
order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
globals.SugarLogger.Debugf("检测 order 数据 %s %d", order.VendorWaybillID, order.WaybillVendorID)
if err != nil {
return nil, err
}
@@ -456,6 +457,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
}
// 美团配送订单兑现
waybillList, err := partner.CurOrderManager.GetOrderWaybillInfo(ctx, vendorOrderID, vendorID, true, false)
globals.SugarLogger.Debugf("检测数据 waybillList %d %s", waybillList[0].Waybill.WaybillVendorID, waybillList[0].Waybill.VendorWaybillID)
if err != nil {
return nil, err
}
@@ -463,6 +465,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
for _, bill := range waybillList {
waybillMap[bill.WaybillVendorID] = &bill.Waybill
}
globals.SugarLogger.Debugf("waybillMap[waybillList[0].WaybillVendorID].WaybillVendorID===========%d", waybillMap[waybillList[0].WaybillVendorID].WaybillVendorID)
deliveryFeeMap = make(map[int]*partner.WaybillFeeInfo)
var timeoutSecond int
@@ -475,6 +478,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
feeInfo = &partner.WaybillFeeInfo{
Waybill: waybillMap[storeCourier.VendorID],
}
globals.SugarLogger.Debugf("feeInfo===========%s", feeInfo.Waybill.VendorWaybillID)
} else {
if storeCourier.Status != model.StoreStatusOpened {
feeInfo = &partner.WaybillFeeInfo{