From 070b8f0b8a507108f077a75a24a833472ac42cd9 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Tue, 15 Jul 2025 11:05:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0store=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cool/store/enums/ErrorCodeEnum.java  |  1 +
 .../src/main/resources/mapper/StoreMapper.xml          |  2 +-
 .../cool/store/service/impl/SyncMainSysServerImpl.java | 10 ++++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
index 94cd9cc7b..ae9839744 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
@@ -286,6 +286,7 @@ public enum ErrorCodeEnum {
     PRODUCTS_RECORD_NOT_EXIST(1511033,"预炸记录不存在！",null),
     PRODUCTS_DISCARDED(1511034,"产品已报销，无法操作",null),
     PRODUCTS_SALES_COMPLETED(1511034,"含有销售完成的产品，无法批量报销",null),
+    STORE_IS_EXIST(1511035,"该门店已存在",null),
     ;
 
 
diff --git a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
index 9674b39de..65ce3b3ab 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
@@ -76,7 +76,7 @@
     <select id="getByStoreNum" resultMap="BaseResultMap">
         select *
         from store_${enterpriseId}
-        where store_num = #{storeNum}
+        where store_num = #{storeNum} and is_delete = 'effective'
     </select>
 
     <select id="listByMobile" resultMap="BaseResultMap">
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java
index b26818dfd..cefe2bf34 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java
@@ -5,6 +5,7 @@ import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.dao.*;
 import com.cool.store.entity.*;
 import com.cool.store.enums.*;
+import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.FranchiseFeeMapper;
 import com.cool.store.mapper.SignFranchiseMapper;
 import com.cool.store.mq.producer.SimpleMessageService;
@@ -23,6 +24,7 @@ import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 import static com.cool.store.enums.AuditExecuteEnum.FRANCHISEES;
 import static com.cool.store.enums.ExtendFieldTypeEnum.*;
@@ -68,12 +70,17 @@ public class SyncMainSysServerImpl implements SyncMainSysServer {
     private LineInfoDAO lineInfoDAO;
     @Value("${mybatis.configuration.variables.enterpriseId}")
     private String eid;
-
+    @Resource
+    private StoreDao storeDao;
     @Override
     @Async
     public void syncStore(Long shopId) {
         StoreRequestBody requestBody = new StoreRequestBody();
         ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);
+        StoreDO storeDO = storeDao.getByStoreNum(shopInfo.getShopCode());
+        if (Objects.nonNull(storeDO)){
+            throw  new ServiceException(ErrorCodeEnum.STORE_IS_EXIST);
+        }
         LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId());
         PointInfoDO pointInfoDO = pointInfoDAO.getPointInfoById(shopInfo.getPointId());
         BuildInformationDO buildInformationDO = buildInformationDAO.selectOneByShopId(shopId);
@@ -86,7 +93,6 @@ public class SyncMainSysServerImpl implements SyncMainSysServer {
         requestBody.setCounty(pointInfoDO.getDistrict());
         requestBody.setLocation_address(shopInfo.getDetailAddress());
         requestBody.setStore_address(shopInfo.getDetailAddress());
-        //todo 等待王硕确认
         if (shopInfo.getManagerRegionId() == null) {
             BigRegionDO byRegionId = bigRegionDAO.getByRegionId(shopInfo.getRegionId());
             if (byRegionId != null){