|
|
@ -22,6 +22,8 @@ import com.baiye.modules.distribute.service.StoreUserService;
|
|
|
|
import com.baiye.modules.distribute.vo.StoreDetailsExportVO;
|
|
|
|
import com.baiye.modules.distribute.vo.StoreDetailsExportVO;
|
|
|
|
import com.baiye.modules.distribute.vo.StoreVO;
|
|
|
|
import com.baiye.modules.distribute.vo.StoreVO;
|
|
|
|
import com.baiye.security.util.SecurityUtils;
|
|
|
|
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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
@ -44,6 +46,7 @@ public class StoreServiceImpl extends ExtendServiceImpl<StoreMapper, StoreEntity
|
|
|
|
|
|
|
|
|
|
|
|
private final CustomStoreService customStoreService;
|
|
|
|
private final CustomStoreService customStoreService;
|
|
|
|
private final StoreUserService storeUserService;
|
|
|
|
private final StoreUserService storeUserService;
|
|
|
|
|
|
|
|
private final SysUserService sysUserService;
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public PageResult<StoreVO> queryStorePage(PageParam pageParam, StoreQo storeQo) {
|
|
|
|
public PageResult<StoreVO> queryStorePage(PageParam pageParam, StoreQo storeQo) {
|
|
|
@ -53,10 +56,22 @@ public class StoreServiceImpl extends ExtendServiceImpl<StoreMapper, StoreEntity
|
|
|
|
if (CollUtil.isNotEmpty(records)) {
|
|
|
|
if (CollUtil.isNotEmpty(records)) {
|
|
|
|
List<Long> storeIds = records.stream().map(StoreVO::getId).collect(Collectors.toList());
|
|
|
|
List<Long> storeIds = records.stream().map(StoreVO::getId).collect(Collectors.toList());
|
|
|
|
Map<Long, Integer> map = customStoreService.countReservationByStoreIds(storeIds);
|
|
|
|
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) {
|
|
|
|
for (StoreVO vo : records) {
|
|
|
|
vo.setReservationNum(map.get(vo.getId()));
|
|
|
|
vo.setReservationNum(map.get(vo.getId()));
|
|
|
|
vo.setAddress(vo.getCity() + vo.getCounty());
|
|
|
|
vo.setAddress(vo.getCity() + vo.getCounty());
|
|
|
|
vo.setTradeTime(vo.getTradeStartTime() + "-" + vo.getTradeEndTime());
|
|
|
|
vo.setTradeTime(vo.getTradeStartTime() + "-" + vo.getTradeEndTime());
|
|
|
|
|
|
|
|
if (vo.getUserId() != null) {
|
|
|
|
|
|
|
|
vo.setUserName(userInfo.get(vo.getUserId()));
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return storeEntityPageResult;
|
|
|
|
return storeEntityPageResult;
|
|
|
|