From 2eaa1533c2cea2796e028fc5ad8cbc4a7ed409de Mon Sep 17 00:00:00 2001
From: suzhuhong <zhuhong.su@coolcollege.cn>
Date: Fri, 2 Jan 2026 11:54:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=BA=97-=E6=8B=9B=E5=95=86=E7=BB=8F?=
 =?UTF-8?q?=E7=90=86=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/BigRegionMapper.xml  | 14 +++++++++++++-
 .../src/main/resources/mapper/StoreMapper.xml      |  1 +
 .../src/main/java/com/cool/store/dto/StoreDTO.java |  6 ++++++
 .../main/java/com/cool/store/entity/StoreDO.java   |  2 ++
 .../cool/store/service/impl/StoreServiceImpl.java  | 13 +++++++++++--
 5 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml
index b4dbbe94a..b54a851df 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml
@@ -46,7 +46,19 @@
         and type = #{type}
       </if>
     </where>
-    order by enable_flag desc
+      order by
+      enable_flag desc,
+      <choose>
+        <when test="type != null and type == 2">
+          id asc
+        </when>
+        <when test="type != null and type == 1">
+          id desc
+        </when>
+        <otherwise>
+          id asc
+        </otherwise>
+      </choose>
   </select>
 
   <select id="queryOrgInfoByBigRegionAndJoinMode" resultMap="BaseResultMap">
diff --git a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
index 1a974b618..7cefdd7b0 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
@@ -41,6 +41,7 @@
         <result column="monthly_other_expenses" property="monthlyOtherExpenses"/>
         <result column="unified_management" property="unifiedManagement" jdbcType="TINYINT"/>
         <result column="join_model" property="joinModel" jdbcType="TINYINT"/>
+        <result column="join_supervision" property="joinSupervision" jdbcType="VARCHAR"/>
         <result column="join_brand" property="joinBrand" jdbcType="TINYINT"/>
         <result column="store_type" property="storeType" jdbcType="TINYINT"/>
         <result column="mini_program_order_store_name" property="miniProgramOrderStoreName"/>
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java
index a09d3333c..9bc065572 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java
@@ -70,4 +70,10 @@ public class StoreDTO {
 
     @ApiModelProperty("区")
     private String county;
+
+    @ApiModelProperty("招商经理")
+    private String investManager;
+
+    @ApiModelProperty("招商经理手机号")
+    private String investManagerMobile;
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java
index 35c9d2a9e..ec21a60f8 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java
@@ -265,4 +265,6 @@ public class StoreDO {
 
     private Long branch;
 
+    private String joinSupervision;
+
 }
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 697808c84..60abfda3c 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
@@ -94,10 +94,14 @@ public class StoreServiceImpl implements StoreService {
                 .filter(Objects::nonNull)
                 .collect(Collectors.toSet());
 
+        List<String> userIds = list.stream().filter(Objects::nonNull).map(StoreDO::getJoinSupervision).collect(Collectors.toList());
+        Map<String, EnterpriseUserDO> userNameMap = enterpriseUserDAO.getUserMap(userIds);
+
+
         List<RegionDO> regionList = regionMapper.getByIds(new ArrayList<>(regionIds));
         Map<Long, String> regionNameMap = regionList.stream().collect(Collectors.toMap(RegionDO::getId, RegionDO::getName));
 
-        List<StoreDTO> storeDTOS = processStores(list, regionNameMap);
+        List<StoreDTO> storeDTOS = processStores(list, regionNameMap,userNameMap);
         info.setList(storeDTOS);
         return info;
     }
@@ -390,7 +394,7 @@ public class StoreServiceImpl implements StoreService {
     }
 
 
-    public static List<StoreDTO> processStores(List<StoreDO> stores,Map<Long, String> regionMap) {
+    public static List<StoreDTO> processStores(List<StoreDO> stores,Map<Long, String> regionMap,Map<String, EnterpriseUserDO> userMap) {
         // 处理每个门店
         return stores.stream().map(store -> {
             StoreDTO dto = BeanUtil.toBean(store, StoreDTO.class);
@@ -407,6 +411,11 @@ public class StoreServiceImpl implements StoreService {
             if (store.getBranch()!=null){
                 dto.setBranchName(regionMap.get(store.getBranch()));
             }
+            if (store.getJoinSupervision()!=null){
+                EnterpriseUserDO enterpriseUserDO = userMap.getOrDefault(store.getJoinSupervision(),new EnterpriseUserDO());
+                dto.setInvestManager(enterpriseUserDO.getUserId());
+                dto.setInvestManagerMobile(enterpriseUserDO.getMobile());
+            }
             return dto;
         }).collect(Collectors.toList());
     }