This commit is contained in:
邹宗楠
2023-10-18 19:00:31 +08:00
parent 75c0404fe8
commit d949fb70ec
3 changed files with 2 additions and 10 deletions

View File

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