From b71e8017b375b751af74a9b2b6fea4ca317f15b7 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Thu, 31 Jul 2025 17:23:07 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/StoreHomepageController.java | 12 +-- .../storeHomepage/StoreHomeDecorationVO.java | 9 +-- .../storeHomepage/StoreHomeDecorationDTO.java | 15 ++-- .../xkt/service/IStoreHomepageService.java | 8 +- .../impl/StoreHomepageServiceImpl.java | 80 +++++++++++-------- 5 files changed, 68 insertions(+), 56 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreHomepageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreHomepageController.java index bf4341a04..9db7a7b82 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreHomepageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreHomepageController.java @@ -34,9 +34,9 @@ public class StoreHomepageController extends XktBaseController { @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()") @ApiOperation(value = "新增档口装修数据", httpMethod = "POST", response = R.class) @Log(title = "新增档口装修数据", businessType = BusinessType.INSERT) - @PostMapping("/decoration/{storeId}") - public R addDecoration(@PathVariable("storeId") Long storeId, @Validated @RequestBody StoreHomeDecorationVO decorationVO) { - return R.ok(storeHomeService.insert(storeId, BeanUtil.toBean(decorationVO, StoreHomeDecorationDTO.class))); + @PostMapping("/decoration") + public R addDecoration(@Validated @RequestBody StoreHomeDecorationVO decorationVO) { + return R.ok(storeHomeService.insert(BeanUtil.toBean(decorationVO, StoreHomeDecorationDTO.class))); } @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()") @@ -49,9 +49,9 @@ public class StoreHomepageController extends XktBaseController { @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()") @ApiOperation(value = "修改档口装修数据", httpMethod = "PUT", response = R.class) @Log(title = "修改档口装修数据", businessType = BusinessType.UPDATE) - @PutMapping("/decoration/{storeId}") - public R editDecoration(@PathVariable("storeId") Long storeId, @Validated @RequestBody StoreHomeDecorationVO homepageVO) { - return R.ok(storeHomeService.updateStoreHomepage(storeId, BeanUtil.toBean(homepageVO, StoreHomeDecorationDTO.class))); + @PutMapping("/decoration") + public R editDecoration(@Validated @RequestBody StoreHomeDecorationVO homepageVO) { + return R.ok(storeHomeService.updateStoreHomepage(BeanUtil.toBean(homepageVO, StoreHomeDecorationDTO.class))); } @ApiOperation(value = "获取档口推荐商品列表", httpMethod = "GET", response = R.class) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeDecorationVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeDecorationVO.java index 723175da3..0015278a0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeDecorationVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeDecorationVO.java @@ -20,6 +20,9 @@ import java.util.List; @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreHomeDecorationVO { + @NotNull(message = "档口ID不能为空!") + @ApiModelProperty(value = "档口ID", required = true) + private Long storeId; @NotNull(message = "模板编号不能为空!") @ApiModelProperty(value = "模板编号", required = true) private Integer templateNum; @@ -30,7 +33,6 @@ public class StoreHomeDecorationVO { @Data public static class BigBannerVO { - @ApiModelProperty(value = "业务类型ID，如果选择：不跳转 不传，选择：跳转店铺，传storeId，选择：跳转商品，传storeProdId") private Long bizId; @ApiModelProperty(value = "业务名称") @@ -47,23 +49,20 @@ public class StoreHomeDecorationVO { private Integer fileType; @ApiModelProperty(value = "排序") private Integer orderNum; - } @Data public static class DecorationVO { - @ApiModelProperty(value = "文件大小") private Long bizId; @ApiModelProperty(value = "业务名称") private String bizName; - @ApiModelProperty(value = "文件大小") + @ApiModelProperty(value = "跳转类型") private Integer jumpType; @ApiModelProperty(value = "文件类型 2轮播小图 3店家推荐 4人气爆款 5当季新品 6销量排行") private Integer fileType; @ApiModelProperty(value = "排序") private Integer orderNum; - } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeDecorationDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeDecorationDTO.java index 2f74fb347..33a22a633 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeDecorationDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeDecorationDTO.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.List; @@ -18,19 +19,22 @@ import java.util.List; @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreHomeDecorationDTO { + @ApiModelProperty(value = "档口ID") + private Long storeId; @ApiModelProperty(value = "模板编号") private Integer templateNum; @ApiModelProperty(value = "档口首页装修大轮播图") - private List bannerList; + private List bigBannerList; @ApiModelProperty(value = "档口首页装修其它图部分") - private List decorList; + private List decorationList; @Data @ApiModel(value = "档口首页各模块") public static class BigBannerDTO { - @ApiModelProperty(value = "业务类型ID，如果选择：不跳转 不传，选择：跳转店铺，传storeId，选择：跳转商品，传storeProdId") private Long bizId; + @ApiModelProperty(value = "业务名称") + private String bizName; @ApiModelProperty(value = "跳转类型 1. 不跳转 2. 跳转店铺 3. 跳转商品") private Integer jumpType; @ApiModelProperty(value = "文件名称") @@ -43,22 +47,21 @@ public class StoreHomeDecorationDTO { private Integer fileType; @ApiModelProperty(value = "排序") private Integer orderNum; - } @Data @ApiModel(value = "档口首页各模块") public static class DecorationDTO { - @ApiModelProperty(value = "文件大小") private Long bizId; + @ApiModelProperty(value = "业务名称") + private String bizName; @ApiModelProperty(value = "文件大小") private Integer jumpType; @ApiModelProperty(value = "文件类型 2轮播小图 3店家推荐 4人气爆款 5当季新品 6销量排行") private Integer fileType; @ApiModelProperty(value = "排序") private Integer orderNum; - } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreHomepageService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreHomepageService.java index 63e2cb17a..cbae0aa39 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreHomepageService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreHomepageService.java @@ -15,11 +15,10 @@ public interface IStoreHomepageService { /** * 新增档口首页各部分图 * - * @param storeId 档口ID * @param homepageDTO 新增档口首页各部分图 * @return Integer */ - Integer insert(Long storeId, StoreHomeDecorationDTO homepageDTO); + Integer insert(StoreHomeDecorationDTO homepageDTO); /** * 获取档口首页各个部分的图信息 @@ -32,11 +31,10 @@ public interface IStoreHomepageService { /** * 更新档口首页各部分图信息 * - * @param storeId 档口ID - * @param homeDTO 更新的dto + * @param homeDTO 更新的dto * @return Integer */ - Integer updateStoreHomepage(Long storeId, StoreHomeDecorationDTO homeDTO); + Integer updateStoreHomepage(StoreHomeDecorationDTO homeDTO); /** * 获取档口推荐商品列表 diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreHomepageServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreHomepageServiceImpl.java index e736138a6..a065ca2bd 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreHomepageServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreHomepageServiceImpl.java @@ -54,22 +54,24 @@ public class StoreHomepageServiceImpl implements IStoreHomepageService { /** * 新增档口首页各部分图 * - * @param storeId 档口ID - * @param templateNum 使用的模板No * @param homepageDTO 新增档口首页各部分图 * @return Integer */ @Override @Transactional - public Integer insert(Long storeId, StoreHomeDecorationDTO homepageDTO) { + public Integer insert(StoreHomeDecorationDTO homepageDTO) { // 用户是否为档口管理者或子账户 - if (!SecurityUtils.isAdmin() && !SecurityUtils.isStoreManagerOrSub(storeId)) { + if (!SecurityUtils.isAdmin() && !SecurityUtils.isStoreManagerOrSub(homepageDTO.getStoreId())) { throw new ServiceException("当前用户非档口管理者或子账号，无权限操作!", HttpStatus.ERROR); } - List homepageList = this.insertToHomepage(storeId, homepageDTO); + List homepageList = this.insertToHomepage(homepageDTO); + if (CollectionUtils.isEmpty(homepageList)) { + return 0; + } // 当前档口首页各部分总的文件大小 - BigDecimal totalSize = homepageDTO.getBannerList().stream().map(x -> ObjectUtils.defaultIfNull(x.getFileSize(), BigDecimal.ZERO)).reduce(BigDecimal.ZERO, BigDecimal::add); - Store store = Optional.ofNullable(this.storeMapper.selectOne(new LambdaQueryWrapper().eq(Store::getId, storeId).eq(Store::getDelFlag, Constants.UNDELETED))) + BigDecimal totalSize = homepageDTO.getBigBannerList().stream().map(x -> ObjectUtils.defaultIfNull(x.getFileSize(), BigDecimal.ZERO)).reduce(BigDecimal.ZERO, BigDecimal::add); + Store store = Optional.ofNullable(this.storeMapper.selectOne(new LambdaQueryWrapper() + .eq(Store::getId, homepageDTO.getStoreId()).eq(Store::getDelFlag, Constants.UNDELETED))) .orElseThrow(() -> new ServiceException("档口不存在!", HttpStatus.ERROR)); store.setTemplateNum(homepageDTO.getTemplateNum()); // 更新档口首页使用的总的文件容量 @@ -97,24 +99,36 @@ public class StoreHomepageServiceImpl implements IStoreHomepageService { .orElseThrow(() -> new ServiceException("档口不存在!", HttpStatus.ERROR)); List homeList = this.storeHomeMapper.selectList(new LambdaQueryWrapper() .eq(StoreHomepage::getStoreId, storeId).eq(StoreHomepage::getDelFlag, Constants.UNDELETED)); + if (CollectionUtils.isEmpty(homeList)) { + return new StoreHomeDecorationResDTO(); + } + final List fileIdList = homeList.stream().map(StoreHomepage::getFileId).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(fileIdList)) { + return new StoreHomeDecorationResDTO(); + } List fileList = Optional.ofNullable(this.fileMapper.selectList(new LambdaQueryWrapper() - .in(SysFile::getId, homeList.stream().map(StoreHomepage::getFileId).filter(ObjectUtils::isNotEmpty).collect(Collectors.toList())) - .eq(SysFile::getDelFlag, Constants.UNDELETED))) + .in(SysFile::getId, fileIdList).eq(SysFile::getDelFlag, Constants.UNDELETED))) .orElseThrow(() -> new ServiceException("文件不存在", HttpStatus.ERROR)); Map fileMap = fileList.stream().collect(Collectors.toMap(SysFile::getId, Function.identity())); - // 所有的档口商品ID - List storeProdList = Optional.ofNullable(this.storeProdMapper.selectList(new LambdaQueryWrapper() - .eq(StoreProduct::getStoreId, storeId).in(StoreProduct::getId, homeList.stream() - .filter(x -> Objects.equals(x.getJumpType(), HomepageJumpType.JUMP_PRODUCT.getValue())).map(StoreHomepage::getBizId).collect(Collectors.toList())) - .eq(StoreProduct::getDelFlag, Constants.UNDELETED))) - .orElseThrow(() -> new ServiceException("档口商品不存在", HttpStatus.ERROR)); - Map storeProdMap = storeProdList.stream().collect(Collectors.toMap(StoreProduct::getId, Function.identity())); + Map storeProdMap = new HashMap<>(); + // 档口商品ID列表 + List storeProdIdList = homeList.stream() + .filter(x -> Objects.equals(x.getJumpType(), HomepageJumpType.JUMP_PRODUCT.getValue())).map(StoreHomepage::getBizId).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(storeProdIdList)) { + // 所有的档口商品ID + List storeProdList = Optional.ofNullable(this.storeProdMapper.selectList(new LambdaQueryWrapper() + .eq(StoreProduct::getStoreId, storeId).in(StoreProduct::getId, storeProdIdList) + .eq(StoreProduct::getDelFlag, Constants.UNDELETED))) + .orElseThrow(() -> new ServiceException("档口商品不存在", HttpStatus.ERROR)); + storeProdMap = storeProdList.stream().collect(Collectors.toMap(StoreProduct::getId, Function.identity())); + } + Map finalStoreProdMap = storeProdMap; // 轮播图 List bigBannerList = homeList.stream().filter(x -> Objects.equals(x.getFileType(), HomepageType.SLIDING_PICTURE.getValue())) .map(x -> { StoreHomeDecorationResDTO.DecorationDTO decorationDTO = BeanUtil.toBean(x, StoreHomeDecorationResDTO.DecorationDTO.class) .setBizName((Objects.equals(x.getJumpType(), HomepageJumpType.JUMP_PRODUCT.getValue())) - ? (storeProdMap.containsKey(x.getBizId()) ? storeProdMap.get(x.getBizId()).getProdArtNum() : null) + ? (finalStoreProdMap.containsKey(x.getBizId()) ? finalStoreProdMap.get(x.getBizId()).getProdArtNum() : null) : (ObjectUtils.isEmpty(x.getBizId()) ? null : store.getStoreName())); if (fileMap.containsKey(x.getFileId())) { decorationDTO.setFileType(x.getFileType()).setFileName(fileMap.get(x.getFileId()).getFileName()) @@ -126,7 +140,7 @@ public class StoreHomepageServiceImpl implements IStoreHomepageService { List decorList = homeList.stream().filter(x -> !Objects.equals(x.getFileType(), HomepageType.SLIDING_PICTURE.getValue())) .map(x -> { StoreHomeDecorationResDTO.DecorationDTO decorationDTO = BeanUtil.toBean(x, StoreHomeDecorationResDTO.DecorationDTO.class) - .setBizName(storeProdMap.containsKey(x.getBizId()) ? storeProdMap.get(x.getBizId()).getProdArtNum() : null); + .setBizName(finalStoreProdMap.containsKey(x.getBizId()) ? finalStoreProdMap.get(x.getBizId()).getProdArtNum() : null); if (fileMap.containsKey(x.getFileId())) { decorationDTO.setFileType(x.getFileType()).setFileName(fileMap.get(x.getFileId()).getFileName()) .setFileUrl(fileMap.get(x.getFileId()).getFileUrl()).setFileSize(fileMap.get(x.getFileId()).getFileSize()); @@ -144,28 +158,27 @@ public class StoreHomepageServiceImpl implements IStoreHomepageService { /** * 更新档口首页各部分图信息 * - * @param storeId 档口ID * @param homepageDTO 更新的dto * @return Integer */ @Override @Transactional - public Integer updateStoreHomepage(Long storeId, StoreHomeDecorationDTO homepageDTO) { + public Integer updateStoreHomepage(StoreHomeDecorationDTO homepageDTO) { // 用户是否为档口管理者或子账户 - if (!SecurityUtils.isAdmin() && !SecurityUtils.isStoreManagerOrSub(storeId)) { + if (!SecurityUtils.isAdmin() && !SecurityUtils.isStoreManagerOrSub(homepageDTO.getStoreId())) { throw new ServiceException("当前用户非档口管理者或子账号，无权限操作!", HttpStatus.ERROR); } // 先将所有的档口模板的文件都删除掉 List oldHomeList = this.storeHomeMapper.selectList(new LambdaQueryWrapper() - .eq(StoreHomepage::getStoreId, storeId).eq(StoreHomepage::getDelFlag, Constants.UNDELETED)); + .eq(StoreHomepage::getStoreId, homepageDTO.getStoreId()).eq(StoreHomepage::getDelFlag, Constants.UNDELETED)); if (CollectionUtils.isNotEmpty(oldHomeList)) { oldHomeList.forEach(x -> x.setDelFlag(Constants.DELETED)); this.storeHomeMapper.updateById(oldHomeList); } // 新增档口首页各个部分的图信息 - List homepageList = this.insertToHomepage(storeId, homepageDTO); + List homepageList = this.insertToHomepage(homepageDTO); Store store = Optional.ofNullable(this.storeMapper.selectOne(new LambdaQueryWrapper() - .eq(Store::getId, storeId).eq(Store::getDelFlag, Constants.UNDELETED))) + .eq(Store::getId, homepageDTO.getStoreId()).eq(Store::getDelFlag, Constants.UNDELETED))) .orElseThrow(() -> new ServiceException("档口不存在!", HttpStatus.ERROR)); store.setTemplateNum(homepageDTO.getTemplateNum()); this.storeMapper.updateById(store); @@ -516,25 +529,24 @@ public class StoreHomepageServiceImpl implements IStoreHomepageService { /** * 新增档口首页模板展示 * - * @param storeId 档口ID * @param homepageDTO 新增档口首页入参 * @return */ - private List insertToHomepage(Long storeId, StoreHomeDecorationDTO homepageDTO) { - // 新增的首页轮播大图部分 - List bigBannerFileList = homepageDTO.getBannerList().stream().filter(x -> StringUtils.isNotBlank(x.getFileUrl()) - && StringUtils.isNotBlank(x.getFileName()) && ObjectUtils.isNotEmpty(x.getFileSize()) && ObjectUtils.isNotEmpty(x.getOrderNum())) - .map(x -> BeanUtil.toBean(x, SysFile.class)).collect(Collectors.toList()); + private List insertToHomepage(StoreHomeDecorationDTO homepageDTO) { List homePageList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(bigBannerFileList)) { + if (CollectionUtils.isNotEmpty(homepageDTO.getBigBannerList())) { + // 新增的首页轮播大图部分 + List bigBannerFileList = homepageDTO.getBigBannerList().stream().filter(x -> StringUtils.isNotBlank(x.getFileUrl()) + && StringUtils.isNotBlank(x.getFileName()) && ObjectUtils.isNotEmpty(x.getFileSize()) && ObjectUtils.isNotEmpty(x.getOrderNum())) + .map(x -> BeanUtil.toBean(x, SysFile.class)).collect(Collectors.toList()); this.fileMapper.insert(bigBannerFileList); Map bigBannerMap = bigBannerFileList.stream().collect(Collectors.toMap(SysFile::getFileName, Function.identity())); - homePageList.addAll(homepageDTO.getBannerList().stream().map(x -> BeanUtil.toBean(x, StoreHomepage.class).setStoreId(storeId) + homePageList.addAll(homepageDTO.getBigBannerList().stream().map(x -> BeanUtil.toBean(x, StoreHomepage.class).setStoreId(homepageDTO.getStoreId()) .setFileId(bigBannerMap.containsKey(x.getFileName()) ? bigBannerMap.get(x.getFileName()).getId() : null)) .collect(Collectors.toList())); } - if (CollectionUtils.isNotEmpty(homepageDTO.getDecorList())) { - homePageList.addAll(homepageDTO.getDecorList().stream().map(x -> BeanUtil.toBean(x, StoreHomepage.class).setStoreId(storeId)) + if (CollectionUtils.isNotEmpty(homepageDTO.getDecorationList())) { + homePageList.addAll(homepageDTO.getDecorationList().stream().map(x -> BeanUtil.toBean(x, StoreHomepage.class).setStoreId(homepageDTO.getStoreId())) .collect(Collectors.toList())); } if (CollectionUtils.isNotEmpty(homePageList)) {