From 2ab3fede64ca4219011c2f398ee17b4c97d95154 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Thu, 4 Dec 2025 18:44:48 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=B5=8F=E8=A7=88=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=EF=BC=8C=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=20?= =?UTF-8?q?=E5=B7=B2=E5=88=A0=E9=99=A4=E5=95=86=E5=93=81=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/xkt/dto/storeProduct/StoreProdAppResDTO.java | 2 ++ .../com/ruoyi/xkt/dto/storeProduct/StoreProdPCResDTO.java | 2 ++ .../ruoyi/xkt/service/impl/StoreProductServiceImpl.java | 8 ++++++++ xkt/src/main/resources/mapper/StoreProductMapper.xml | 2 ++ 4 files changed, 14 insertions(+) diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdAppResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdAppResDTO.java index 37c3f643e..029cf5011 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdAppResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdAppResDTO.java @@ -33,6 +33,8 @@ public class StoreProdAppResDTO { private String prodArtNum; @ApiModelProperty(value = "商品标题") private String prodTitle; + @ApiModelProperty(value = "商品状态") + private Integer prodStatus; @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPCResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPCResDTO.java index b24e66a7f..213025727 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPCResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPCResDTO.java @@ -25,6 +25,8 @@ public class StoreProdPCResDTO { private String storeName; @ApiModelProperty(value = "档口商品ID") private Long storeProdId; + @ApiModelProperty(value = "商品状态") + private Integer prodStatus; @ApiModelProperty(value = "商品货号") private String prodArtNum; @ApiModelProperty(value = "商品标题") 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 115f4f9c9..5695063c5 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 @@ -842,6 +842,10 @@ public class StoreProductServiceImpl implements IStoreProductService { public StoreProdAppResDTO getAppInfo(Long storeProdId) { // 档口商品的基础信息 StoreProdAppResDTO appResDTO = this.storeProdMapper.getAppInfo(storeProdId, SecurityUtils.getUserIdSafe()); + // 如果商品已删除，则报错 + if (ObjectUtils.isEmpty(appResDTO) || Objects.equals(appResDTO.getProdStatus(), EProductStatus.REMOVED.getValue())) { + throw new ServiceException("商品已删除或不存在!请您浏览其它商品", HttpStatus.ERROR); + } StoreProductCategoryAttribute cateAttr = this.storeProdCateAttrMapper.selectOne(new LambdaQueryWrapper() .eq(StoreProductCategoryAttribute::getStoreProdId, storeProdId).eq(StoreProductCategoryAttribute::getDelFlag, Constants.UNDELETED)); List colorList = this.storeProdColorMapper.selectList(new LambdaQueryWrapper() @@ -957,6 +961,10 @@ public class StoreProductServiceImpl implements IStoreProductService { public StoreProdPCResDTO getPCInfo(Long storeProdId) { // 商品基础信息 StoreProdPCResDTO prodInfoDTO = ObjectUtils.defaultIfNull(this.storeProdMapper.selectPCProdInfo(storeProdId, SecurityUtils.getUserIdSafe()), new StoreProdPCResDTO()); + // 如果商品已删除，则报错 + if (ObjectUtils.isEmpty(prodInfoDTO) || Objects.equals(prodInfoDTO.getProdStatus(), EProductStatus.REMOVED.getValue())) { + throw new ServiceException("商品已删除或不存在!请您浏览其它商品", HttpStatus.ERROR); + } // 获取商品的属性 StoreProductCategoryAttribute cateAttr = this.storeProdCateAttrMapper.selectOne(new LambdaQueryWrapper() .eq(StoreProductCategoryAttribute::getStoreProdId, storeProdId).eq(StoreProductCategoryAttribute::getDelFlag, Constants.UNDELETED)); diff --git a/xkt/src/main/resources/mapper/StoreProductMapper.xml b/xkt/src/main/resources/mapper/StoreProductMapper.xml index 1e7d29db0..0627af508 100644 --- a/xkt/src/main/resources/mapper/StoreProductMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductMapper.xml @@ -220,6 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sp.id AS storeProdId, sp.prod_art_num, sp.prod_title, + sp.prod_status, sp.create_time, spd.detail, @@ -285,6 +286,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" s.store_name, sp.prod_art_num, sp.prod_title, + sp.prod_status, sp.create_time, MIN( DISTINCT spcs.price ) AS minPrice, GROUP_CONCAT( DISTINCT dpt.tag ORDER BY dpt.type ASC ) AS tagStr,