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

add log

Browse Source
This commit is contained in:
richboo111
2022-12-23 14:34:40 +08:00
parent c030364b33
commit a140f53bc1
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -445,6 +445,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
if err != nil {
return nil, err
}
globals.SugarLogger.Debugf("QueryOrderWaybillFeeInfoEx order===========%s", utils.Format4Output(order, false))
if order.DeliveryType == model.OrderDeliveryTypeSelfTake {
return nil, fmt.Errorf("订单:%s是自提单", vendorOrderID)
}
@@ -454,23 +455,26 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
if err != nil {
return nil, err
}
globals.SugarLogger.Debugf("QueryOrderWaybillFeeInfoEx storeCourierList===========%s", utils.Format4Output(storeCourierList, false))
// 美团配送订单兑现
waybillList, err := partner.CurOrderManager.GetOrderWaybillInfo(ctx, vendorOrderID, vendorID, true, false)
if err != nil {
return nil, err
}
globals.SugarLogger.Debugf("QueryOrderWaybillFeeInfoEx waybillList===========%s", utils.Format4Output(waybillList, false))
waybillMap := make(map[int]*model.Waybill)
for _, bill := range waybillList {
waybillMap[bill.WaybillVendorID] = &bill.Waybill
}
deliveryFeeMap = make(map[int]*partner.WaybillFeeInfo)
globals.SugarLogger.Debugf("pre deliveryFeeMap=======%s", utils.Format4Output(deliveryFeeMap, false))
var timeoutSecond int
if savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, false); savedOrderInfo != nil {
timeoutSecond = savedOrderInfo.GetCreateWaybillTimeout()
}
for _, storeCourier := range storeCourierList {
var feeInfo *partner.WaybillFeeInfo
globals.SugarLogger.Debugf("waybillMap[storeCourier.VendorID]============%v", waybillMap[storeCourier.VendorID])
if waybillMap[storeCourier.VendorID] != nil {
feeInfo = &partner.WaybillFeeInfo{
Waybill: waybillMap[storeCourier.VendorID],
@@ -491,6 +495,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
ErrStr: err.Error(),
}
} else {
globals.SugarLogger.Debugf("feeInfo.DeliveryFee===========%d", feeInfo.DeliveryFee)
feeInfo.TimeoutSecond = timeoutSecond
}
} else {
@@ -510,6 +515,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
deliveryFeeMap[storeCourier.VendorID] = feeInfo
}
err = nil
globals.SugarLogger.Debugf("after deliveryFeeMap==========%s", utils.Format4Output(deliveryFeeMap, false))
return deliveryFeeMap, err
}()
}, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID))