From 910efd055db5faacd67c4d6755087effb80e014f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Fri, 5 Sep 2025 15:51:21 +0800
Subject: [PATCH 1/6] feat:getStoreListByMobile

---
 .../src/main/resources/mapper/StoreMapper.xml | 79 ++++++++++++-------
 .../impl/BuildInformationServiceImpl.java     | 24 +++---
 2 files changed, 66 insertions(+), 37 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
index 506a50d72..b6959f9e7 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
@@ -89,9 +89,9 @@
 
     <select id="listByMobile" resultMap="BaseResultMap">
         select *
-        from store_${enterpriseId}
+        from store_${enterpriseId} a left join store_master_signer_info_5558ce7a3aa84e3590392fcaa8697ffb b on a.store_id = b.store_id
         <where>
-            and is_delete = 'effective'
+            and a.is_delete = 'effective'
             <if test="mobile!=null and mobile !=''">
                 and `extend_field` like concat('%', #{mobile}, '%')
             </if>
@@ -99,34 +99,57 @@
     </select>
 
     <select id="getSubStoreByRegionIdsAndMobile" resultType="com.cool.store.response.MiniShopsResponse">
-        select store_id as storeId, store_name as shopName, store_num as shopCode, store_address as detailAddress
-        from store_${enterpriseId}
-        where is_delete = 'effective'
-        <if test="storeName!=null and storeName!=''">
-            and store_name like concat('%', #{storeName}, '%')
-        </if>
-        <if test="storeNum!=null and storeNum!=''">
-            and store_num = #{storeNum}
-        </if>
-        and (
-        <if test="regionIdList != null and regionIdList.size >0 ">
-            <foreach collection="regionIdList" item="regionId" separator=" or " open=" (" close=" )">
-                region_path like concat('%/', #{regionId}, '/%')
-            </foreach>
-        </if>
-        <if test="mobile!=null and mobile !=''">
-            <choose>
-                <when test="regionIdList != null and regionIdList.size >0 ">
-                    or `extend_field` like concat('%', #{mobile}, '%')
-                </when>
-                <otherwise>
-                    `extend_field` like concat('%', #{mobile}, '%')
-                </otherwise>
-            </choose>
-        </if>
-        )
+        <choose>
+            <!-- 情况1：regionIdList不为空，使用UNION优化 -->
+            <when test="regionIdList != null and regionIdList.size > 0">
+                SELECT store_id as storeId, store_name as shopName, store_num as shopCode, store_address as detailAddress
+                FROM store_${enterpriseId} a
+                WHERE a.is_delete = 'effective'
+                <if test="storeName!=null and storeName!=''">
+                    AND a.store_name LIKE CONCAT('%', #{storeName}, '%')
+                </if>
+                <if test="storeNum!=null and storeNum!=''">
+                    AND a.store_num = #{storeNum}
+                </if>
+                AND (
+                <foreach collection="regionIdList" item="regionId" separator=" OR ">
+                    a.region_path LIKE CONCAT('%/', #{regionId}, '/%')
+                </foreach>
+                )
+
+                UNION
+
+                SELECT a.store_id as storeId, a.store_name as shopName, a.store_num as shopCode, a.store_address as detailAddress
+                FROM store_${enterpriseId} a
+                INNER JOIN store_master_signer_info_${enterpriseId} b ON a.store_id = b.store_id
+                WHERE a.is_delete = 'effective'
+                <if test="storeName!=null and storeName!=''">
+                    AND a.store_name LIKE CONCAT('%', #{storeName}, '%')
+                </if>
+                <if test="storeNum!=null and storeNum!=''">
+                    AND a.store_num = #{storeNum}
+                </if>
+                AND (b.signer1_mobile = #{mobile} OR b.signer2_mobile = #{mobile})
+            </when>
+
+            <!-- 情况2：regionIdList为空，直接查询关联表 -->
+            <otherwise>
+                SELECT a.store_id as storeId, a.store_name as shopName, a.store_num as shopCode, a.store_address as detailAddress
+                FROM store_${enterpriseId} a
+                INNER JOIN store_master_signer_info_${enterpriseId} b ON a.store_id = b.store_id
+                WHERE a.is_delete = 'effective'
+                <if test="storeName!=null and storeName!=''">
+                    AND a.store_name LIKE CONCAT('%', #{storeName}, '%')
+                </if>
+                <if test="storeNum!=null and storeNum!=''">
+                    AND a.store_num = #{storeNum}
+                </if>
+                AND (b.signer1_mobile = #{mobile} OR b.signer2_mobile = #{mobile})
+            </otherwise>
+        </choose>
     </select>
 
+
     <select id="list" resultMap="BaseResultMap">
         select *
         from store_${enterpriseId} where is_delete = 'effective' order by id asc
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
index fb36918f4..8a41319c4 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
@@ -1,6 +1,7 @@
 package com.cool.store.service.impl;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.dao.*;
 import com.cool.store.entity.*;
@@ -20,7 +21,7 @@ import com.cool.store.service.UserAuthMappingService;
 import com.cool.store.utils.RedisConstantUtil;
 import com.cool.store.utils.RedisUtilPool;
 import com.cool.store.utils.poi.StringUtils;
-import io.lettuce.core.ZAddArgs;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +39,7 @@ import java.util.stream.Stream;
  * @createDate 2024-10-09 14:05:52
  */
 @Service
+@Slf4j
 public class BuildInformationServiceImpl implements BuildInformationService {
     @Resource
     private  PlatformBuildDAO platformBuildDAO;
@@ -195,6 +197,7 @@ public class BuildInformationServiceImpl implements BuildInformationService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer submitOrUpdate(BuildInformationRequest request) {
+        log.info("提交/修改建店资料开始,shopId:{}", JSONObject.toJSONString(request));
         String lockKey = redisConstantUtil.submitBuildKey(request.getShopId());
         String lockValue = UUID.randomUUID().toString();
         boolean acquired = false;
@@ -202,14 +205,17 @@ public class BuildInformationServiceImpl implements BuildInformationService {
             acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.TEN_SECONDS);
             if (Boolean.TRUE.equals(acquired)) {
                 ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId());
-//                if (JoinModeEnum.FLAGSHIP_STORE.getCode()!=shopInfoDO.getJoinMode()){
-//                    //校验结算人非空
-//                    if (StringUtils.isAnyBlank(request.getSettlerName(),request.getSettlerIdCardFront(),
-//                            request.getSettlerInHandFrontPicture(),request.getSettlerBankBackPhotoUrl(),
-//                            request.getSettlerBankNumber(),request.getSettlerBankMobile(),request.getSettlerBankName())) {
-//                        throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
-//                    }
-//                }
+                if (JoinModeEnum.FLAGSHIP_STORE.getCode()!=shopInfoDO.getJoinMode()){
+                    log.info("FLAGSHIP_STORE：{}，{}，{}，{}，{}，{}，{}",request.getSettlerName(),request.getSettlerIdCardFront(),
+                            request.getSettlerInHandFrontPicture(),request.getSettlerBankBackPhotoUrl(),
+                            request.getSettlerBankNumber(),request.getSettlerBankMobile(),request.getSettlerBankName());
+                    //校验结算人非空
+                    if (StringUtils.isAnyBlank(request.getSettlerName(),request.getSettlerIdCardFront(),
+                            request.getSettlerInHandFrontPicture(),request.getSettlerBankBackPhotoUrl(),
+                            request.getSettlerBankNumber(),request.getSettlerBankMobile(),request.getSettlerBankName())) {
+                        throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
+                    }
+                }
 
                 BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(request.getShopId());
                 BuildInformationDO buildInformationDO = request.toDO();

From e682027be5d20eaf7eb78f471eaab18570da542d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Fri, 5 Sep 2025 16:23:29 +0800
Subject: [PATCH 2/6] feat:getStoreListByMobile

---
 .../impl/BuildInformationServiceImpl.java     | 192 +++++++++---------
 1 file changed, 96 insertions(+), 96 deletions(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
index 8a41319c4..1daeb4fb5 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
@@ -75,6 +75,102 @@ public class BuildInformationServiceImpl implements BuildInformationService {
     private BigRegionDAO bigRegionDAO;
 
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Integer submitOrUpdate(BuildInformationRequest request) {
+        log.info("提交/修改建店资料开始,shopId:{}", JSONObject.toJSONString(request));
+        String lockKey = redisConstantUtil.submitBuildKey(request.getShopId());
+        String lockValue = UUID.randomUUID().toString();
+        boolean acquired = false;
+        try {
+            acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.TEN_SECONDS);
+            if (Boolean.TRUE.equals(acquired)) {
+                ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId());
+//                if (JoinModeEnum.FLAGSHIP_STORE.getCode()!=shopInfoDO.getJoinMode()){
+//                    log.info("FLAGSHIP_STORE：{}，{}，{}，{}，{}，{}，{}",request.getSettlerName(),request.getSettlerIdCardFront(),
+//                            request.getSettlerInHandFrontPicture(),request.getSettlerBankBackPhotoUrl(),
+//                            request.getSettlerBankNumber(),request.getSettlerBankMobile(),request.getSettlerBankName());
+//                    //校验结算人非空
+//                    if (StringUtils.isAnyBlank(request.getSettlerName(),request.getSettlerIdCardFront(),
+//                            request.getSettlerInHandFrontPicture(),request.getSettlerBankBackPhotoUrl(),
+//                            request.getSettlerBankNumber(),request.getSettlerBankMobile(),request.getSettlerBankName())) {
+//                        throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
+//                    }
+//                }
+
+                BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(request.getShopId());
+                BuildInformationDO buildInformationDO = request.toDO();
+                OrderSysInfoDO orderSysInfoDO = getOrderSysInfoDO(request);
+                OrderSysInfoDO orderSysInfoDO1 = orderSysInfoDAO.selectByShopId(request.getShopId());
+                if (Objects.nonNull(orderSysInfoDO1)) {
+                    orderSysInfoDAO.updateByShopId(orderSysInfoDO);
+                } else {
+                    orderSysInfoDAO.insertSelective(orderSysInfoDO);
+                }
+                LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId());
+                QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfoDO.getId());
+                if (request.getJuridicalIsSamePartner()) {
+                    buildInformationDO.setJuridicalName(lineInfoDO.getUsername());
+                    buildInformationDO.setJuridicalIdCardNo(qualificationsInfoDO.getIdCardNo());
+                    buildInformationDO.setJuridicalIdCardFront(qualificationsInfoDO.getFrontOfIdCard());
+                    buildInformationDO.setJuridicalIdCardReverse(qualificationsInfoDO.getBackOfIdCard());
+                }
+                if (request.getSettlerIsSamePartner()!=null&&request.getSettlerIsSamePartner()) {
+                    buildInformationDO.setSettlerIdCardNo(qualificationsInfoDO.getIdCardNo());
+                    buildInformationDO.setSettlerName(lineInfoDO.getUsername());
+                    buildInformationDO.setSettlerIdCardFront(qualificationsInfoDO.getFrontOfIdCard());
+                    buildInformationDO.setSettlerIdCardReverse(qualificationsInfoDO.getBackOfIdCard());
+                }
+                if (Objects.isNull(informationDO)) {
+                    buildInformationDO.setCreateTime(new Date());
+                    buildInformationDO.setUpdateTime(new Date());
+                    shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151);
+                    HashMap<String, String> map = new HashMap<>();
+                    map.put("partnerUsername", lineInfoDO.getUsername());
+                    map.put("partnerMobile", lineInfoDO.getMobile());
+                    map.put("storeName", shopInfoDO.getShopName());
+                    List<EnterpriseUserDO> logisticsList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.LOGISTICS, shopInfoDO.getRegionId());
+                    List<String> logistics = new ArrayList<>();
+                    if (Objects.nonNull(logisticsList)) {
+                        logistics.addAll(logisticsList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
+                    }
+                    commonService.sendQWMessage(logistics,
+                            MessageEnum.MESSAGE_52,
+                            map);
+                    return buildInformationDAO.insertSelective(buildInformationDO);
+                } else {
+                    buildInformationDO.setUpdateTime(new Date());
+                    List<PlatformBuildDO> platformBuildDOS = platformBuildDAO.selectByShopId(request.getShopId());
+                    if (CollectionUtils.isNotEmpty(platformBuildDOS)){
+                        for (PlatformBuildDO platformBuildDO : platformBuildDOS){
+                            platformBuildDO.setSettlerName(buildInformationDO.getSettlerName());
+                            platformBuildDO.setSettlerIdCardFront(buildInformationDO.getSettlerIdCardFront());
+                            platformBuildDO.setSettlerIdCardReverse(buildInformationDO.getSettlerIdCardReverse());
+                            platformBuildDO.setSettlerInHandBackPicture(buildInformationDO.getSettlerInHandBackPicture());
+                            platformBuildDO.setSettlerInHandFrontPicture(buildInformationDO.getSettlerInHandFrontPicture());
+                            platformBuildDO.setSettlerIdCardNo(buildInformationDO.getSettlerIdCardNo());
+                            platformBuildDO.setSettlerBankPhotoUrl(buildInformationDO.getSettlerBankPhotoUrl());
+                            platformBuildDO.setSettlerBankNumber(buildInformationDO.getSettlerBankNumber());
+                            platformBuildDO.setSettlerBankMobile(buildInformationDO.getSettlerBankMobile());
+                            platformBuildDO.setSettlerBankName(buildInformationDO.getSettlerBankName());
+                        }
+                    }
+                    platformBuildDAO.batchUpdate(platformBuildDOS);
+                    return buildInformationDAO.updateByShopIdSelective(buildInformationDO);
+                }
+            }else{
+                throw  new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION);
+            }
+        } finally {
+            if (Boolean.TRUE.equals(acquired)) {
+                String currentValue = redisUtilPool.getString(lockKey);
+                if (lockValue.equals(currentValue)) {
+                    redisUtilPool.delKey(lockKey);
+                }
+            }
+        }
+    }
+
     @Override
     public BuildInformationResponse getBuildInformation(Long shopId) {
         BuildInformationResponse response = new BuildInformationResponse();
@@ -194,102 +290,6 @@ public class BuildInformationServiceImpl implements BuildInformationService {
         response.setJuridicalIsSamePartner(informationDO.getJuridicalIsSamePartner());
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Integer submitOrUpdate(BuildInformationRequest request) {
-        log.info("提交/修改建店资料开始,shopId:{}", JSONObject.toJSONString(request));
-        String lockKey = redisConstantUtil.submitBuildKey(request.getShopId());
-        String lockValue = UUID.randomUUID().toString();
-        boolean acquired = false;
-        try {
-            acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.TEN_SECONDS);
-            if (Boolean.TRUE.equals(acquired)) {
-                ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId());
-                if (JoinModeEnum.FLAGSHIP_STORE.getCode()!=shopInfoDO.getJoinMode()){
-                    log.info("FLAGSHIP_STORE：{}，{}，{}，{}，{}，{}，{}",request.getSettlerName(),request.getSettlerIdCardFront(),
-                            request.getSettlerInHandFrontPicture(),request.getSettlerBankBackPhotoUrl(),
-                            request.getSettlerBankNumber(),request.getSettlerBankMobile(),request.getSettlerBankName());
-                    //校验结算人非空
-                    if (StringUtils.isAnyBlank(request.getSettlerName(),request.getSettlerIdCardFront(),
-                            request.getSettlerInHandFrontPicture(),request.getSettlerBankBackPhotoUrl(),
-                            request.getSettlerBankNumber(),request.getSettlerBankMobile(),request.getSettlerBankName())) {
-                        throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
-                    }
-                }
-
-                BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(request.getShopId());
-                BuildInformationDO buildInformationDO = request.toDO();
-                OrderSysInfoDO orderSysInfoDO = getOrderSysInfoDO(request);
-                OrderSysInfoDO orderSysInfoDO1 = orderSysInfoDAO.selectByShopId(request.getShopId());
-                if (Objects.nonNull(orderSysInfoDO1)) {
-                    orderSysInfoDAO.updateByShopId(orderSysInfoDO);
-                } else {
-                    orderSysInfoDAO.insertSelective(orderSysInfoDO);
-                }
-                LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId());
-                QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfoDO.getId());
-                if (request.getJuridicalIsSamePartner()) {
-                    buildInformationDO.setJuridicalName(lineInfoDO.getUsername());
-                    buildInformationDO.setJuridicalIdCardNo(qualificationsInfoDO.getIdCardNo());
-                    buildInformationDO.setJuridicalIdCardFront(qualificationsInfoDO.getFrontOfIdCard());
-                    buildInformationDO.setJuridicalIdCardReverse(qualificationsInfoDO.getBackOfIdCard());
-                }
-                if (request.getSettlerIsSamePartner()!=null&&request.getSettlerIsSamePartner()) {
-                    buildInformationDO.setSettlerIdCardNo(qualificationsInfoDO.getIdCardNo());
-                    buildInformationDO.setSettlerName(lineInfoDO.getUsername());
-                    buildInformationDO.setSettlerIdCardFront(qualificationsInfoDO.getFrontOfIdCard());
-                    buildInformationDO.setSettlerIdCardReverse(qualificationsInfoDO.getBackOfIdCard());
-                }
-                if (Objects.isNull(informationDO)) {
-                    buildInformationDO.setCreateTime(new Date());
-                    buildInformationDO.setUpdateTime(new Date());
-                    shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151);
-                    HashMap<String, String> map = new HashMap<>();
-                    map.put("partnerUsername", lineInfoDO.getUsername());
-                    map.put("partnerMobile", lineInfoDO.getMobile());
-                    map.put("storeName", shopInfoDO.getShopName());
-                    List<EnterpriseUserDO> logisticsList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.LOGISTICS, shopInfoDO.getRegionId());
-                    List<String> logistics = new ArrayList<>();
-                    if (Objects.nonNull(logisticsList)) {
-                        logistics.addAll(logisticsList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
-                    }
-                    commonService.sendQWMessage(logistics,
-                            MessageEnum.MESSAGE_52,
-                            map);
-                    return buildInformationDAO.insertSelective(buildInformationDO);
-                } else {
-                    buildInformationDO.setUpdateTime(new Date());
-                    List<PlatformBuildDO> platformBuildDOS = platformBuildDAO.selectByShopId(request.getShopId());
-                    if (CollectionUtils.isNotEmpty(platformBuildDOS)){
-                        for (PlatformBuildDO platformBuildDO : platformBuildDOS){
-                            platformBuildDO.setSettlerName(buildInformationDO.getSettlerName());
-                            platformBuildDO.setSettlerIdCardFront(buildInformationDO.getSettlerIdCardFront());
-                            platformBuildDO.setSettlerIdCardReverse(buildInformationDO.getSettlerIdCardReverse());
-                            platformBuildDO.setSettlerInHandBackPicture(buildInformationDO.getSettlerInHandBackPicture());
-                            platformBuildDO.setSettlerInHandFrontPicture(buildInformationDO.getSettlerInHandFrontPicture());
-                            platformBuildDO.setSettlerIdCardNo(buildInformationDO.getSettlerIdCardNo());
-                            platformBuildDO.setSettlerBankPhotoUrl(buildInformationDO.getSettlerBankPhotoUrl());
-                            platformBuildDO.setSettlerBankNumber(buildInformationDO.getSettlerBankNumber());
-                            platformBuildDO.setSettlerBankMobile(buildInformationDO.getSettlerBankMobile());
-                            platformBuildDO.setSettlerBankName(buildInformationDO.getSettlerBankName());
-                        }
-                    }
-                    platformBuildDAO.batchUpdate(platformBuildDOS);
-                    return buildInformationDAO.updateByShopIdSelective(buildInformationDO);
-                }
-            }else{
-                throw  new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION);
-            }
-        } finally {
-            if (Boolean.TRUE.equals(acquired)) {
-                String currentValue = redisUtilPool.getString(lockKey);
-                if (lockValue.equals(currentValue)) {
-                    redisUtilPool.delKey(lockKey);
-                }
-            }
-        }
-    }
-
     private static @NotNull OrderSysInfoDO getOrderSysInfoDO(BuildInformationRequest request) {
         OrderSysInfoDO orderSysInfoDO = new OrderSysInfoDO();
         orderSysInfoDO.setShopId(request.getShopId());

From 5c0bf74249954fbaee0164669626e132241fc4be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Fri, 12 Sep 2025 10:50:08 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat:listByMobile=20=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/StoreMapper.xml         | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
index b6959f9e7..fdfa9c396 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
@@ -88,10 +88,19 @@
     </select>
 
     <select id="listByMobile" resultMap="BaseResultMap">
-        select *
+        select a.*
         from store_${enterpriseId} a left join store_master_signer_info_5558ce7a3aa84e3590392fcaa8697ffb b on a.store_id = b.store_id
         <where>
             and a.is_delete = 'effective'
+            <if test="mobile!=null and mobile !=''">
+                and ( b.signer1_mobile = #{mobile} or b.signer2_mobile = #{mobile})
+            </if>
+        </where>
+        union
+        select *
+        from store_${enterpriseId}
+        <where>
+            and is_delete = 'effective'
             <if test="mobile!=null and mobile !=''">
                 and `extend_field` like concat('%', #{mobile}, '%')
             </if>

From 77cf158d3ceb20d53e445f2c498e8e312b540932 Mon Sep 17 00:00:00 2001
From: wangff <feifan.wang@hao168.com>
Date: Tue, 23 Sep 2025 14:00:01 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=E8=8E=B7=E5=8F=96=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=E7=AD=BE?=
 =?UTF-8?q?=E7=BA=A6=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/store/StoreMasterSignerInfoDAO.java   | 37 +++++++++++++++++++
 .../cool/store/dto/store/StoreUserDTO.java    |  6 +++
 .../store/service/impl/StoreServiceImpl.java  | 17 +++++++++
 pom.xml                                       |  2 +-
 4 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
new file mode 100644
index 000000000..75a361452
--- /dev/null
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
@@ -0,0 +1,37 @@
+package com.cool.store.dao.store;
+
+import cn.hutool.core.collection.CollStreamUtil;
+import com.cool.store.entity.store.StoreMasterSignerInfoDO;
+import com.cool.store.mapper.store.StoreMasterSignerInfoMapper;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Repository;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 门店签约信息DAO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/9/23
+ */
+@Repository
+@RequiredArgsConstructor
+public class StoreMasterSignerInfoDAO {
+    private final StoreMasterSignerInfoMapper storeMasterSignerInfoMapper;
+
+    /**
+     * 获取门店签约信息Map
+     */
+    public Map<String, StoreMasterSignerInfoDO> getSignerMapByStoreIds(List<String> storeIds) {
+        if (CollectionUtils.isEmpty(storeIds)) {
+            return Collections.emptyMap();
+        }
+        List<StoreMasterSignerInfoDO> list = storeMasterSignerInfoMapper.selectByStoreIds(storeIds);
+        return CollStreamUtil.toMap(list, StoreMasterSignerInfoDO::getStoreId, v -> v);
+    }
+}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreUserDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreUserDTO.java
index 9ea6811b7..33104e47a 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreUserDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/store/StoreUserDTO.java
@@ -1,6 +1,7 @@
 package com.cool.store.dto.store;
 
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @Author suzhuhong
@@ -8,6 +9,7 @@ import lombok.Data;
  * @Version 1.0
  */
 @Data
+@NoArgsConstructor
 public class StoreUserDTO {
 
     private String userId;
@@ -18,4 +20,8 @@ public class StoreUserDTO {
 
     private String positionName;
 
+    public StoreUserDTO(String userName, String mobile) {
+        this.userName = userName;
+        this.mobile = mobile;
+    }
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
index c2b36d9c6..30d9d5bf0 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
@@ -1,8 +1,10 @@
 package com.cool.store.service.impl;
 
+import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.cool.store.dao.store.StoreMasterSignerInfoDAO;
 import com.cool.store.dto.store.AuthStoreUserDTO;
 import com.cool.store.dao.EnterpriseUserDAO;
 import com.cool.store.dao.EnterpriseUserRoleDao;
@@ -16,6 +18,7 @@ import com.cool.store.entity.EnterpriseUserDO;
 import com.cool.store.entity.StoreDO;
 import com.cool.store.entity.SysRoleDO;
 import com.cool.store.entity.UserAuthMappingDO;
+import com.cool.store.entity.store.StoreMasterSignerInfoDO;
 import com.cool.store.enums.*;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.*;
@@ -70,6 +73,8 @@ public class StoreServiceImpl implements StoreService {
     EnterpriseUserMapper enterpriseUserMapper;
     @Resource
     EnterpriseUserGroupMappingMapper enterpriseUserGroupMappingMapper;
+    @Resource
+    StoreMasterSignerInfoDAO storeMasterSignerInfoDAO;
 
     @Override
     public PageInfo<StoreDTO> getStoreExtendFieldInfo(Integer pageSize, Integer pageNum) {
@@ -120,6 +125,8 @@ public class StoreServiceImpl implements StoreService {
         if (CollectionUtils.isEmpty(list)){
             return  new ArrayList<>();
         }
+        List<String> storeIds = CollStreamUtil.toList(list, StoreDO::getStoreId);
+        Map<String, StoreMasterSignerInfoDO> signerMap = storeMasterSignerInfoDAO.getSignerMapByStoreIds(storeIds);
         List<StoreUserPositionDTO> result = new ArrayList<>();
         list.forEach(x->{
             StoreUserPositionDTO storeUserPositionDTO = new StoreUserPositionDTO();
@@ -140,6 +147,16 @@ public class StoreServiceImpl implements StoreService {
                 storeUserDTO.setPositionName(String.join(Constants.COMMA, positionNameList));
                 userList.add(storeUserDTO);
             }
+            StoreMasterSignerInfoDO signerInfoDO = signerMap.get(x.getStoreId());
+            if (Objects.nonNull(signerInfoDO)) {
+                Set<String> mobiles = CollStreamUtil.toSet(userList, StoreUserDTO::getMobile);
+                if (StringUtils.isNotBlank(signerInfoDO.getSigner1Mobile()) && mobiles.add(signerInfoDO.getSigner1Mobile())) {
+                    userList.add(new StoreUserDTO(signerInfoDO.getSigner1Name(), signerInfoDO.getSigner1Mobile()));
+                }
+                if (StringUtils.isNotBlank(signerInfoDO.getSigner2Mobile()) && mobiles.add(signerInfoDO.getSigner2Mobile())) {
+                    userList.add(new StoreUserDTO(signerInfoDO.getSigner2Name(), signerInfoDO.getSigner2Mobile()));
+                }
+            }
             storeUserPositionDTO.setUserList(userList);
             result.add(storeUserPositionDTO);
         });
diff --git a/pom.xml b/pom.xml
index 545c8d7fa..b4d687d85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
             <dependency>
                 <groupId>cn.hutool</groupId>
                 <artifactId>hutool-all</artifactId>
-                <version>5.0.7</version>
+                <version>5.7.22</version>
             </dependency>
             <dependency>
                 <groupId>com.aliyun</groupId>

From 48fe55c8be90b6abbc72fefa50677e51ce12ea56 Mon Sep 17 00:00:00 2001
From: wangff <feifan.wang@hao168.com>
Date: Tue, 23 Sep 2025 14:01:48 +0800
Subject: [PATCH 5/6] fix

---
 .../store/StoreMasterSignerInfoMapper.java    | 19 ++++++
 .../store/storeMasterSignerInfoMapper.xml     | 35 +++++++++++
 .../entity/store/StoreMasterSignerInfoDO.java | 63 +++++++++++++++++++
 3 files changed, 117 insertions(+)
 create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/mapper/store/StoreMasterSignerInfoMapper.java
 create mode 100644 coolstore-partner-dao/src/main/resources/mapper/store/storeMasterSignerInfoMapper.xml
 create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/entity/store/StoreMasterSignerInfoDO.java

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/store/StoreMasterSignerInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/store/StoreMasterSignerInfoMapper.java
new file mode 100644
index 000000000..67e2231e3
--- /dev/null
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/store/StoreMasterSignerInfoMapper.java
@@ -0,0 +1,19 @@
+package com.cool.store.mapper.store;
+
+
+import com.cool.store.entity.store.StoreMasterSignerInfoDO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author zhangchenbiao
+ * @date 2025-09-23 11:32
+ */
+public interface StoreMasterSignerInfoMapper {
+
+    /**
+     * 根据门店id查询签约信息
+     */
+    List<StoreMasterSignerInfoDO> selectByStoreIds(@Param("storeIds") List<String> storeIds);
+}
\ No newline at end of file
diff --git a/coolstore-partner-dao/src/main/resources/mapper/store/storeMasterSignerInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/store/storeMasterSignerInfoMapper.xml
new file mode 100644
index 000000000..7ed5ca403
--- /dev/null
+++ b/coolstore-partner-dao/src/main/resources/mapper/store/storeMasterSignerInfoMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cool.store.mapper.store.StoreMasterSignerInfoMapper">
+  <resultMap id="BaseResultMap" type="com.cool.store.entity.store.StoreMasterSignerInfoDO">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="store_id" jdbcType="VARCHAR" property="storeId" />
+    <result column="signer1_name" jdbcType="VARCHAR" property="signer1Name" />
+    <result column="signer1_mobile" jdbcType="VARCHAR" property="signer1Mobile" />
+    <result column="signer1_id_card_no" jdbcType="VARCHAR" property="signer1IdCardNo" />
+    <result column="signer1_id_card_front" jdbcType="VARCHAR" property="signer1IdCardFront" />
+    <result column="signer1_id_card_back" jdbcType="VARCHAR" property="signer1IdCardBack" />
+    <result column="signer2_name" jdbcType="VARCHAR" property="signer2Name" />
+    <result column="signer2_mobile" jdbcType="VARCHAR" property="signer2Mobile" />
+    <result column="signer2_id_card_no" jdbcType="VARCHAR" property="signer2IdCardNo" />
+    <result column="signer2_id_card_front" jdbcType="VARCHAR" property="signer2IdCardFront" />
+    <result column="signer2_id_card_back" jdbcType="VARCHAR" property="signer2IdCardBack" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, store_id, signer1_name, signer1_mobile, signer1_id_card_no, signer1_id_card_front, 
+    signer1_id_card_back, signer2_name, signer2_mobile, signer2_id_card_no, signer2_id_card_front, 
+    signer2_id_card_back, create_time, update_time
+  </sql>
+
+  <select id="selectByStoreIds" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"/>
+    from store_master_signer_info_${enterpriseId}
+    where store_id in
+    <foreach item="storeId" collection="storeIds" open="(" separator="," close=")">
+      #{storeId}
+    </foreach>
+  </select>
+</mapper>
\ No newline at end of file
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/store/StoreMasterSignerInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/store/StoreMasterSignerInfoDO.java
new file mode 100644
index 000000000..f3518fc6f
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/store/StoreMasterSignerInfoDO.java
@@ -0,0 +1,63 @@
+package com.cool.store.entity.store;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 
+ * @author   wangff
+ * @date   2025-09-23 11:32
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class StoreMasterSignerInfoDO implements Serializable {
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("门店ID")
+    private String storeId;
+
+    @ApiModelProperty("签约人1姓名")
+    private String signer1Name;
+
+    @ApiModelProperty("签约人1手机号")
+    private String signer1Mobile;
+
+    @ApiModelProperty("签约人1身份证号()")
+    private String signer1IdCardNo;
+
+    @ApiModelProperty("签约人1身份证正面图片路径")
+    private String signer1IdCardFront;
+
+    @ApiModelProperty("签约人1身份证反面图片路径")
+    private String signer1IdCardBack;
+
+    @ApiModelProperty("签约人2姓名")
+    private String signer2Name;
+
+    @ApiModelProperty("签约人2手机号")
+    private String signer2Mobile;
+
+    @ApiModelProperty("签约人2身份证号()")
+    private String signer2IdCardNo;
+
+    @ApiModelProperty("签约人2身份证正面图片路径")
+    private String signer2IdCardFront;
+
+    @ApiModelProperty("签约人2身份证反面图片路径")
+    private String signer2IdCardBack;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+}
\ No newline at end of file

From 026d5fcdcae4c46eeb05a6e35e03924b4c4a4700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Wed, 24 Sep 2025 09:56:25 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E7=9D=A3=E5=AF=BC?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/SysRoleMapper.xml                 | 2 +-
 .../src/main/resources/mapper/UserAuthMappingMapper.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml
index 754787c3e..e3f3d8f52 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml
@@ -397,7 +397,7 @@
         and eu.active = true
         --         and sr.source = 'create'
         <if test="positionType != null and positionType != '' ">
-            and sr.position_type = #{positionType}
+            and (sr.position_type = #{positionType} or sr.id  = 180000000)
         </if>
         and eu.user_status = '1'
     </select>
diff --git a/coolstore-partner-dao/src/main/resources/mapper/UserAuthMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/UserAuthMappingMapper.xml
index ded24a4de..c1db9d00b 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/UserAuthMappingMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/UserAuthMappingMapper.xml
@@ -55,7 +55,7 @@
                 </foreach>
             </if>
             <if test="positionType!=null and positionType!=''">
-                and b.position_type =#{positionType}
+                and (b.position_type =#{positionType} or b.id  = 180000000 )
             </if>
               <if test="notRoleAuth!=null and notRoleAuth!=''">
                   and b.role_auth !=#{notRoleAuth}