From 33aba471ef121e5ea8ed435b1436b72ab6554d39 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Wed, 9 Aug 2023 10:35:10 +0800
Subject: [PATCH] 1

---
 business/partner/delivery/sfps/waybill.go | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go
index 19205d908..4f5fb0e62 100644
--- a/business/partner/delivery/sfps/waybill.go
+++ b/business/partner/delivery/sfps/waybill.go
@@ -93,14 +93,27 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i
 	var (
 		weight        int
 		productDetail []*sfps2.ProductDetail
+		param         = &sfps2.CreateOrderReq{}
 	)
 	if order.Weight >= 49500 || order.Weight <= model.NO {
 		weight = 49500
 	} else {
 		weight = order.Weight
 	}
-
-	param := &sfps2.CreateOrderReq{
+	// 城市维度获取顺丰门店id
+	if len(store.CityName) > 0 {
+		globals.SugarLogger.Debugf("sfps CreateWaybill store.CityName==%s", store.CityName)
+		for k, v := range sfps2.SFCityStoreIDs {
+			if strings.Contains(k, store.CityName) {
+				param.ShopId = v
+			} else {
+				return nil, errors.New("此城市暂时不在顺丰配送业务范围")
+			}
+		}
+	} else {
+		return nil, errors.New("门店不允许没有城市名，请检查门店信息")
+	}
+	param = &sfps2.CreateOrderReq{
 		ShopId:          sfps2.SFShopStoreID,
 		ShopOrderId:     order.VendorOrderID,
 		OrderSource:     GetVendorSource(order.VendorID),
@@ -219,6 +232,7 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo
 	}
 	// 城市维度获取顺丰门店id
 	if len(store.CityName) > 0 {
+		globals.SugarLogger.Debugf("sfps GetWaybillFee store.CityName==%s", store.CityName)
 		for k, v := range sfps2.SFCityStoreIDs {
 			if strings.Contains(k, store.CityName) {
 				param.ShopId = v