From ead90730d4c8561356a6179aa0de4344a0d4ee4e Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Thu, 18 Sep 2025 11:42:02 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=B7=B2=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=95=B0=E6=8D=AEbug=E4=BF=AE=E5=A4=8D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/dto/storeProduct/StoreProdPageDTO.java | 2 ++ .../xkt/service/impl/StoreProductServiceImpl.java | 13 ++++++++----- .../resources/mapper/StoreProductColorMapper.xml | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageDTO.java index 51783d26e..f16999da7 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageDTO.java @@ -26,5 +26,7 @@ public class StoreProdPageDTO extends BasePageDTO { private Long storeId; @ApiModelProperty(value = "商品状态") private List prodStatusList; + @ApiModelProperty(value = "删除标志") + private String delFlag; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java index 6c9d3aa79..2ebe76543 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java @@ -171,6 +171,9 @@ public class StoreProductServiceImpl implements IStoreProductService { if (!SecurityUtils.isAdmin() && !SecurityUtils.isStoreManagerOrSub(pageDTO.getStoreId())) { throw new ServiceException("当前用户非档口管理者或子账号，无权限操作!", HttpStatus.ERROR); } + // 如果是已删除状态，则只查询已删除数据 + pageDTO.setDelFlag(pageDTO.getProdStatusList().stream().allMatch(x -> Objects.equals(x, EProductStatus.REMOVED.getValue())) + ? Constants.DELETED : Constants.UNDELETED); PageHelper.startPage(pageDTO.getPageNum(), pageDTO.getPageSize()); // 调用Mapper方法查询商店产品分页信息 List prodList = storeProdColorMapper.selectStoreProdColorPage(pageDTO); @@ -371,7 +374,7 @@ public class StoreProductServiceImpl implements IStoreProductService { } // 新增的商品颜色 dbProdColorList.add(new StoreProductColor().setStoreColorId(updateProdColorId).setStoreProdId(storeProdId).setStoreId(storeId) - .setColorName(updateProdColorNameList.get(i)).setOrderNum(i+1).setProdStatus(EProductStatus.ON_SALE.getValue())); + .setColorName(updateProdColorNameList.get(i)).setOrderNum(i + 1).setProdStatus(EProductStatus.ON_SALE.getValue())); } // 更新商品颜色或新增商品颜色 this.storeProdColorMapper.insertOrUpdate(dbProdColorList); @@ -475,7 +478,7 @@ public class StoreProductServiceImpl implements IStoreProductService { final List prodColorNameList = createDTO.getSizeList().stream().map(StoreProdDTO.SPCSizeDTO::getColorName).distinct().collect(Collectors.toList()); for (int i = 0; i < prodColorNameList.size(); i++) { prodColorList.add(new StoreProductColor().setStoreColorId(storeColorMap.get(prodColorNameList.get(i))).setStoreProdId(storeProdId) - .setStoreId(storeId).setColorName(prodColorNameList.get(i)).setOrderNum(i+1).setProdStatus(EProductStatus.ON_SALE.getValue())); + .setStoreId(storeId).setColorName(prodColorNameList.get(i)).setOrderNum(i + 1).setProdStatus(EProductStatus.ON_SALE.getValue())); } this.storeProdColorMapper.insert(prodColorList); // 新增档口颜色尺码对应价格 @@ -610,9 +613,9 @@ public class StoreProductServiceImpl implements IStoreProductService { public List prepareGetPicPackDownloadUrl(Long storeProductId) { Assert.notNull(storeProductId); List productFiles = storeProdFileMapper.selectList(Wrappers.lambdaQuery(StoreProductFile.class) - .eq(StoreProductFile::getStoreProdId, storeProductId) - .in(StoreProductFile::getFileType, FileType.picPackValues()) - .eq(XktBaseEntity::getDelFlag, UNDELETED)); + .eq(StoreProductFile::getStoreProdId, storeProductId) + .in(StoreProductFile::getFileType, FileType.picPackValues()) + .eq(XktBaseEntity::getDelFlag, UNDELETED)); if (CollUtil.isEmpty(productFiles)) { return ListUtil.empty(); } diff --git a/xkt/src/main/resources/mapper/StoreProductColorMapper.xml b/xkt/src/main/resources/mapper/StoreProductColorMapper.xml index 8d8c08fdc..56b7cdd4a 100644 --- a/xkt/src/main/resources/mapper/StoreProductColorMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductColorMapper.xml @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" JOIN store_product_file spf ON sp.id = spf.store_prod_id AND spf.file_type = 1 AND spf.order_num = 1 AND spf.del_flag = 0 JOIN sys_file sf ON spf.file_id = sf.id WHERE - spc.del_flag = 0 AND spc.store_id = #{storeId} + spc.del_flag = #{delFlag} AND spc.store_id = #{storeId} AND spc.prod_status IN