BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：店铺装修BUG修复；

pull/1121/head
liujiang 2025-10-25 14:35:55 +08:00
parent 129e30e1a5
commit fcd4515f5f
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreHomepageServiceImpl.java
View File

@ -70,10 +70,7 @@ public class StoreHomepageServiceImpl implements IStoreHomepageService {
if (CollectionUtils.isEmpty(homeList)) { if (CollectionUtils.isEmpty(homeList)) {
return new StoreHomeDecorationResDTO(); return new StoreHomeDecorationResDTO();
} }
final List<Long> fileIdList = homeList.stream().map(StoreHomepage::getFileId).collect(Collectors.toList()); final List<Long> fileIdList = homeList.stream().map(StoreHomepage::getFileId).filter(ObjectUtils::isNotEmpty).collect(Collectors.toList());
if (CollectionUtils.isEmpty(fileIdList)) {
return new StoreHomeDecorationResDTO();
}
List<SysFile> fileList = Optional.ofNullable(this.fileMapper.selectList(new LambdaQueryWrapper<SysFile>() List<SysFile> fileList = Optional.ofNullable(this.fileMapper.selectList(new LambdaQueryWrapper<SysFile>()
.in(SysFile::getId, fileIdList).eq(SysFile::getDelFlag, Constants.UNDELETED))) .in(SysFile::getId, fileIdList).eq(SysFile::getDelFlag, Constants.UNDELETED)))
.orElseThrow(() -> new ServiceException("文件不存在", HttpStatus.ERROR)); .orElseThrow(() -> new ServiceException("文件不存在", HttpStatus.ERROR));
@ -100,11 +97,13 @@ public class StoreHomepageServiceImpl implements IStoreHomepageService {
List<StoreHomeDecorationResDTO.DecorationDTO> bigBannerList = homeList.stream().filter(x -> Objects.equals(x.getFileType(), HomepageType.SLIDING_PICTURE.getValue())) List<StoreHomeDecorationResDTO.DecorationDTO> bigBannerList = homeList.stream().filter(x -> Objects.equals(x.getFileType(), HomepageType.SLIDING_PICTURE.getValue()))
.map(x -> { .map(x -> {
StoreHomeDecorationResDTO.DecorationDTO decorationDTO = BeanUtil.toBean(x, StoreHomeDecorationResDTO.DecorationDTO.class) StoreHomeDecorationResDTO.DecorationDTO decorationDTO = BeanUtil.toBean(x, StoreHomeDecorationResDTO.DecorationDTO.class)
.setBizName((Objects.equals(x.getJumpType(), HomepageJumpType.JUMP_PRODUCT.getValue())) .setFileUrl(fileMap.containsKey(x.getFileId()) ? fileMap.get(x.getFileId()).getFileUrl() : "");
? (finalStoreProdMap.containsKey(x.getBizId()) ? finalStoreProdMap.get(x.getBizId()).getProdArtNum() : null) // 跳转到商品
: (ObjectUtils.isEmpty(x.getBizId()) ? null : store.getStoreName())); if (Objects.equals(x.getJumpType(), HomepageJumpType.JUMP_PRODUCT.getValue())) {
if (fileMap.containsKey(x.getFileId())) { decorationDTO.setBizName(finalStoreProdMap.containsKey(x.getBizId()) ? finalStoreProdMap.get(x.getBizId()).getProdArtNum() : "");
decorationDTO.setFileType(x.getFileType()).setFileUrl(fileMap.get(x.getFileId()).getFileUrl()); // 跳转到档口首页
} else if (Objects.equals(x.getJumpType(), HomepageJumpType.JUMP_STORE.getValue())) {
decorationDTO.setBizName(ObjectUtils.isEmpty(x.getBizId()) ? "" : store.getStoreName());
} }
return decorationDTO; return decorationDTO;
}).collect(Collectors.toList()); }).collect(Collectors.toList());