suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:店-招商经理关系

Browse Source
This commit is contained in:
suzhuhong
2026-01-02 11:54:49 +08:00
parent e34aea7a40
commit 2eaa1533c2
5 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml
View File

@@ -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">

1
coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
View File

@@ -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"/>

6
coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java
View File

@@ -70,4 +70,10 @@ public class StoreDTO {
@ApiModelProperty("区")
private String county;
@ApiModelProperty("招商经理")
private String investManager;
@ApiModelProperty("招商经理手机号")
private String investManagerMobile;
}

2
coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java
View File

@@ -265,4 +265,6 @@ public class StoreDO {
private Long branch;
private String joinSupervision;
}

13
coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
View File

@@ -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());
}