门店管理修改关联用户信息

ad-distribute-system/system-biz/src/main/java/com/baiye/system/mapper/SysUserMapper.java

@@ -149,6 +149,14 @@ public interface SysUserMapper extends ExtendMapper<SysUser> {
 	 */
 	List<SysUserNameRoleDTO> listByRoleCodeAndUserId(@Param("roleCode") String roleCode, @Param("userId") Long userId);
 
+	/**
+	 * 根据用户id查询用户名称
+	 *
+	 * @param userIds ids
+	 * @return
+	 */
+	List<SysUserNameRoleDTO> listUserNameByUserIds(@Param("userIds") List<Long> userIds);
+
 	/**
 	 * 返回用户的select数据 name=> username value => userId
 	 *

ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/SysUserService.java

@@ -129,6 +129,14 @@ public interface SysUserService extends ExtendService<SysUser> {
 	 */
 	List<SysUserNameRoleDTO> listByRoleCodeAndUserId(String roleCode, Long userId);
 
+	/**
+	 * 根据用户id查询用户名称
+	 *
+	 * @param userIds 用户id
+	 * @return List<SysUserNameRoleDTO>
+	 */
+	List<SysUserNameRoleDTO> listUserNameByUserIds(List<Long> userIds);
+
 	/**
 	 * 根据角色查询用户
 	 *
@@ -203,4 +211,5 @@ public interface SysUserService extends ExtendService<SysUser> {
 	 */
 	void updateDistributeNum(List<SysUser> updateSysUserList);
 
+
 }

ad-distribute-system/system-biz/src/main/java/com/baiye/system/service/impl/SysUserServiceImpl.java

@@ -369,6 +369,11 @@ public class SysUserServiceImpl extends ExtendServiceImpl<SysUserMapper, SysUser
 		return baseMapper.listByRoleCodeAndUserId(roleCode, userId);
 	}
 
+	@Override
+	public List<SysUserNameRoleDTO> listUserNameByUserIds(List<Long> userIds) {
+		return baseMapper.listUserNameByUserIds(userIds);
+	}
+
 	/**
 	 * 根据角色查询用户
 	 *

ad-distribute-system/system-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -55,17 +55,30 @@
 
 	<select id="listByRoleCodeAndUserId" resultType="com.baiye.system.model.dto.SysUserNameRoleDTO">
 		select su.username as userName,
-			   su.user_id as userId
-		from
-			sys_user su
-			LEFT JOIN
-			sys_user_role ur
-		on su.user_id = ur.user_id
-		where
-			su.deleted = 0
+			   su.user_id  as userId
+		from sys_user su
+				 LEFT JOIN
+			 sys_user_role ur
+			 on su.user_id = ur.user_id
+		where su.deleted = 0
 		  and su.which_user_id = #{userId}
 		  and ur.role_code = #{roleCode}
 	</select>
+	<select id="listUserNameByUserIds" resultType="com.baiye.system.model.dto.SysUserNameRoleDTO">
+		select
+		username as userName,
+		user_id  as userId
+		from
+		sys_user
+		where
+		<if test="userIds != null and userIds.size() > 0">
+			user_id in
+			<foreach collection="userIds" open="(" separator="," close=")" item="item">
+				#{item}
+			</foreach>
+		</if>
+	</select>
+
 	<select id="listSelectData" resultType="com.baiye.domain.SelectData">
 		select
 		username as name , user_id as value

admin/src/main/java/com/baiye/modules/distribute/service/impl/StoreServiceImpl.java

@@ -22,6 +22,8 @@ import com.baiye.modules.distribute.service.StoreUserService;
 import com.baiye.modules.distribute.vo.StoreDetailsExportVO;
 import com.baiye.modules.distribute.vo.StoreVO;
 import com.baiye.security.util.SecurityUtils;
+import com.baiye.system.model.dto.SysUserNameRoleDTO;
+import com.baiye.system.service.SysUserService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -44,6 +46,7 @@ public class StoreServiceImpl extends ExtendServiceImpl<StoreMapper, StoreEntity
 
 	private final CustomStoreService customStoreService;
 	private final StoreUserService storeUserService;
+	private final SysUserService sysUserService;
 
 	@Override
 	public PageResult<StoreVO> queryStorePage(PageParam pageParam, StoreQo storeQo) {
@@ -53,10 +56,22 @@ public class StoreServiceImpl extends ExtendServiceImpl<StoreMapper, StoreEntity
 		if (CollUtil.isNotEmpty(records)) {
 			List<Long> storeIds = records.stream().map(StoreVO::getId).collect(Collectors.toList());
 			Map<Long, Integer> map = customStoreService.countReservationByStoreIds(storeIds);
+
+			//获取门店关联的用户
+			List<Long> userIds = records.stream().map(StoreVO::getUserId).filter(Objects::nonNull).collect(Collectors.toList());
+			Map<Long, String> userInfo = new HashMap<>(8);
+			if (CollUtil.isNotEmpty(userIds)) {
+				List<SysUserNameRoleDTO> sysUserNameRoleS = sysUserService.listUserNameByUserIds(userIds);
+				userInfo = sysUserNameRoleS.stream().collect(Collectors.toMap(SysUserNameRoleDTO::getUserId, SysUserNameRoleDTO::getUserName));
+			}
+
 			for (StoreVO vo : records) {
 				vo.setReservationNum(map.get(vo.getId()));
 				vo.setAddress(vo.getCity() + vo.getCounty());
 				vo.setTradeTime(vo.getTradeStartTime() + "-" + vo.getTradeEndTime());
+				if (vo.getUserId() != null) {
+					vo.setUserName(userInfo.get(vo.getUserId()));
+				}
 			}
 		}
 		return storeEntityPageResult;

admin/src/main/java/com/baiye/modules/distribute/vo/StoreVO.java

@@ -60,4 +60,9 @@ public class StoreVO {
 
 	@Schema(description = "联系方式")
 	private String nid;
+
+	@Schema(description = "关联的用户id")
+	private Long userId;
+	@Schema(description = "关联的用户名称")
+	private String userName;
 }

admin/src/main/resources/mapper/StoreMapper.xml

@@ -24,9 +24,10 @@
 
 	<select id="selectByPage" resultType="com.baiye.modules.distribute.vo.StoreVO">
 		SELECT
-		<include refid="Base_Alias_Column_List"/>
-		FROM
-		tb_store st
+		<include refid="Base_Alias_Column_List"/>,
+		tsu.user_id as userId
+		FROM tb_store st
+		left join tb_store_user tsu on st.id = tsu.store_id
 		${ew.customSqlSegment}
 	</select>