From 0e5a378706be342e2e19c02ebb117b583956df19 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Tue, 16 Dec 2025 17:25:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E9=85=8D=E9=80=81=E8=B4=B9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=A2=9E=E5=8A=A0=E5=B9=B3=E5=8F=B0=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6id=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/ShopStoreSameCityTransportBase.java  |  3 +++
 .../service/impl/SFExpressApiServiceImpl.java  |  1 +
 ...pStoreSameCityTransportBaseServiceImpl.java | 18 +++++++++++++++---
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransportBase.java b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransportBase.java
index 8204ee6e..6df4c0ac 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransportBase.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransportBase.java
@@ -52,6 +52,9 @@ public class ShopStoreSameCityTransportBase implements Serializable {
     @ApiModelProperty(value = "顺丰同城（第三方）店铺ID")
     private String shop_id;
 
+    @ApiModelProperty(value = "顺丰平台商家Id （用于县级代理商创建店铺的）")
+    private String supplier_id;
+
     @ApiModelProperty(value = "店铺主营商品分类ID")
     private Integer business_type;
 
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java
index fb49d08a..769c80ef 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java
@@ -353,6 +353,7 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
                 return Pair.of(false, "创建顺丰店铺失败，返回的店铺ID为空");
             }
 
+            transportBase.setSupplier_id(sfSupplierId);
             transportBase.setShop_id(sfShopId);
             transportBase.setShop_state(CommonConstant.Enable);         // 顺丰同城快递商品特惠
             transportBase.setDelivery_brand(CommonConstant.DELIVERY_BRAND_SF);
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java
index 9d2ab37e..b31e4c9d 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java
@@ -43,6 +43,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.data.util.Pair;
 import org.springframework.stereotype.Service;
@@ -62,6 +63,10 @@ import static com.suisung.mall.common.utils.ContextUtil.getCurrentUser;
 public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<ShopStoreSameCityTransportBaseMapper, ShopStoreSameCityTransportBase> implements ShopStoreSameCityTransportBaseService {
 
     private static final Logger logger = LoggerFactory.getLogger(ShopStoreSameCityTransportBaseServiceImpl.class);
+
+    @Value("${sf-express.supplier_id}")
+    private String supplierId;
+
     @Autowired
     private ShopStoreSameCityTransportService shopStoreSameCityTransportService;
     @Autowired
@@ -71,7 +76,6 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
     @Autowired
     private ShopOrderInfoService shopOrderInfoService;
 
-
     @Resource
     private AccountBaseConfigService accountBaseConfigService;
 
@@ -325,6 +329,7 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
                 transportBase.setStore_id(storeId);
                 transportBase.setIs_platform(isPlatform);
 
+
                 // 设置默认值
                 transportBase.setArea_type(1);
                 transportBase.setBasis(1);
@@ -351,6 +356,11 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
             }
         }
 
+        // 顺丰同城平台商家Id
+        if (StrUtil.isBlank(transportBase.getSupplier_id())) {
+            transportBase.setSupplier_id(supplierId);
+        }
+
         // 构造返回DTO
         ShopStoreSameCityTransportBaseDTO shopStoreSameCityTransportBaseDTO = new ShopStoreSameCityTransportBaseDTO();
         shopStoreSameCityTransportBaseDTO.setTransportBase(transportBase);
@@ -438,6 +448,10 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
                 transportBase.setWeight_increase_fee(BigDecimal.ZERO);
             }
 
+            if (StrUtil.isBlank(transportBase.getSupplier_id())) {
+                transportBase.setSupplier_id(supplierId);
+            }
+
             // 构建查询条件：确保同一店铺同一平台标识下只有一条启用记录
             QueryWrapper<ShopStoreSameCityTransportBase> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("store_id", transportBase.getStore_id());
@@ -455,7 +469,6 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
                 transportBase.setCreated_at(now);
                 transportBase.setUpdated_at(now);
                 transportBase.setStatus(CommonConstant.Enable); // 确保状态为启用
-
                 if (add(transportBase)) {
                     // 确保获取到ID
                     Long transportBaseId = transportBase.getTransport_base_id();
@@ -479,7 +492,6 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl<S
                 transportBase.setTransport_base_id(exist.getTransport_base_id());
                 transportBase.setUpdated_at(now);
                 transportBase.setStatus(CommonConstant.Enable); // 确保状态为启用
-
                 if (updateById(transportBase)) {
                     log.info("更新同城配送基础信息成功, transportBaseId={}, storeId={}", transportBase.getTransport_base_id(), transportBase.getStore_id());
                     return Pair.of(transportBase.getTransport_base_id(), "更新成功！");