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,