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}
- order by enable_flag desc
+ order by
+ enable_flag desc,
+
+
+ id asc
+
+
+ id desc
+
+
+ id asc
+
+
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 @@
+
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 userIds = list.stream().filter(Objects::nonNull).map(StoreDO::getJoinSupervision).collect(Collectors.toList());
+ Map userNameMap = enterpriseUserDAO.getUserMap(userIds);
+
+
List regionList = regionMapper.getByIds(new ArrayList<>(regionIds));
Map regionNameMap = regionList.stream().collect(Collectors.toMap(RegionDO::getId, RegionDO::getName));
- List storeDTOS = processStores(list, regionNameMap);
+ List storeDTOS = processStores(list, regionNameMap,userNameMap);
info.setList(storeDTOS);
return info;
}
@@ -390,7 +394,7 @@ public class StoreServiceImpl implements StoreService {
}
- public static List processStores(List stores,Map regionMap) {
+ public static List processStores(List stores,Map regionMap,Map 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());
}