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:
邹宗楠
2023-10-18 18:24:41 +08:00
parent 8e7786b21e
commit d598e4919f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -470,14 +470,16 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
if order.DeliveryType == model.OrderDeliveryTypeSelfTake { if order.DeliveryType == model.OrderDeliveryTypeSelfTake {
return nil, fmt.Errorf("订单:%s是自提单", vendorOrderID) return nil, fmt.Errorf("订单:%s是自提单", vendorOrderID)
} }
globals.SugarLogger.Debugf("==============1")
// 获取用户送货地址 // 获取用户送货地址
storeCourierList, err := dao.GetStoreCourierList(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, model.StoreStatusAll, model.StoreAuditStatusOnline) storeCourierList, err := dao.GetStoreCourierList(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, model.StoreStatusAll, model.StoreAuditStatusOnline)
globals.SugarLogger.Debugf("==============2")
if err != nil { if err != nil {
return nil, err return nil, err
} }
// 美团配送订单兑现 // 美团配送订单兑现
waybillList, err := partner.CurOrderManager.GetOrderWaybillInfo(ctx, vendorOrderID, vendorID, true, false) waybillList, err := partner.CurOrderManager.GetOrderWaybillInfo(ctx, vendorOrderID, vendorID, true, false)
globals.SugarLogger.Debugf("==============3")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -492,6 +494,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
} }
store, _ := dao.GetStoreDetail(db, order.JxStoreID, order.VendorID, order.VendorOrgCode) store, _ := dao.GetStoreDetail(db, order.JxStoreID, order.VendorID, order.VendorOrgCode)
globals.SugarLogger.Debugf("==============STORE := %s", utils.Format4Output(store, false))
for _, storeCourier := range storeCourierList { for _, storeCourier := range storeCourierList {
var feeInfo *partner.WaybillFeeInfo var feeInfo *partner.WaybillFeeInfo
if waybillMap[storeCourier.VendorID] != nil { if waybillMap[storeCourier.VendorID] != nil {
@@ -508,6 +511,7 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
if handler := partner.GetDeliveryPlatformFromVendorID(storeCourier.VendorID); handler != nil { if handler := partner.GetDeliveryPlatformFromVendorID(storeCourier.VendorID); handler != nil {
if handler.Use4CreateWaybill { if handler.Use4CreateWaybill {
// 获取订单配送费用 // 获取订单配送费用
globals.SugarLogger.Debugf("==================4 ")
if feeInfo, err = handler.Handler.GetWaybillFee(order); err != nil { if feeInfo, err = handler.Handler.GetWaybillFee(order); err != nil {
feeInfo = &partner.WaybillFeeInfo{ feeInfo = &partner.WaybillFeeInfo{
ErrCode: partner.WaybillFeeErrCodeCourierOthers, ErrCode: partner.WaybillFeeErrCodeCourierOthers,