From 18d8c23d98fe3847ee6af68221d4a4bd31a78aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 7 Mar 2022 10:44:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jxcallback/scheduler/defsch/defsch_ext.go | 68 +++++++++----------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go
index 948c57e1a..9c97bfc80 100644
--- a/business/jxcallback/scheduler/defsch/defsch_ext.go
+++ b/business/jxcallback/scheduler/defsch/defsch_ext.go
@@ -370,50 +370,46 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor
 			}
 			for _, storeCourier := range storeCourierList {
 				var feeInfo *partner.WaybillFeeInfo
-				// 无订单
 				if waybillMap[storeCourier.VendorID] != nil {
 					feeInfo = &partner.WaybillFeeInfo{
 						Waybill: waybillMap[storeCourier.VendorID],
 					}
-					continue
-				}
-				// 未开通运营联系
-				if storeCourier.Status != model.StoreStatusOpened {
-					feeInfo = &partner.WaybillFeeInfo{
-						ErrCode: partner.WaybillFeeErrCodeCourierNotOpen,
-						ErrStr:  fmt.Sprintf("暂未开通，联系运营"),
+				} else {
+					if storeCourier.Status != model.StoreStatusOpened {
+						feeInfo = &partner.WaybillFeeInfo{
+							ErrCode: partner.WaybillFeeErrCodeCourierNotOpen,
+							ErrStr:  fmt.Sprintf("暂未开通，联系运营"),
+						}
+					} else {
+						if handler := partner.GetDeliveryPlatformFromVendorID(storeCourier.VendorID); handler != nil {
+							if handler.Use4CreateWaybill {
+								globals.SugarLogger.Info("获取美团运单开始", handler.Handler.GetVendorID())
+								// 获取订单配送费用
+								if feeInfo, err = handler.Handler.GetWaybillFee(order); err != nil {
+									feeInfo = &partner.WaybillFeeInfo{
+										ErrCode: partner.WaybillFeeErrCodeCourierOthers,
+										ErrStr:  err.Error(),
+									}
+								} else {
+									feeInfo.TimeoutSecond = timeoutSecond
+								}
+							} else {
+								feeInfo = &partner.WaybillFeeInfo{
+									ErrCode: partner.WaybillFeeErrCodeCourierForbidden,
+									ErrStr:  fmt.Sprintf("内部错误，%d不能用于创建运单", storeCourier.VendorID),
+								}
+							}
+						} else {
+							feeInfo = &partner.WaybillFeeInfo{
+								ErrCode: partner.WaybillFeeErrCodeCourierNotSupported,
+								ErrStr:  fmt.Sprintf("内部错误，%d不被支持", storeCourier.VendorID),
+							}
+						}
 					}
-					continue
 				}
-				// 获取订单处理对线
-				handler := partner.GetDeliveryPlatformFromVendorID(storeCourier.VendorID)
-				if handler == nil {
-					feeInfo = &partner.WaybillFeeInfo{
-						ErrCode: partner.WaybillFeeErrCodeCourierNotSupported,
-						ErrStr:  fmt.Sprintf("内部错误，%d不被支持", storeCourier.VendorID),
-					}
-					continue
-				}
-				if !handler.Use4CreateWaybill {
-					feeInfo = &partner.WaybillFeeInfo{
-						ErrCode: partner.WaybillFeeErrCodeCourierForbidden,
-						ErrStr:  fmt.Sprintf("内部错误，%d不能用于创建运单", storeCourier.VendorID),
-					}
-					continue
-				}
-				// 获取订单配送费用
-				globals.SugarLogger.Info("获取美团运单开始", handler.Handler.GetVendorID())
-				feeInfo, err = handler.Handler.GetWaybillFee(order)
-				if err != nil {
-					feeInfo = &partner.WaybillFeeInfo{
-						ErrCode: partner.WaybillFeeErrCodeCourierOthers,
-						ErrStr:  err.Error(),
-					}
-					continue
-				}
-				feeInfo.TimeoutSecond = timeoutSecond
 				deliveryFeeMap[storeCourier.VendorID] = feeInfo
 			}
+			err = nil
 			return deliveryFeeMap, err
 		}()
 	}, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID))