From e7608cbb20ce4b81c04ae96eac3a330444f23e9b Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sat, 29 Mar 2025 00:41:25 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E8=B0=83=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/web/controller/xkt/StoreProductController.java | 2 +- .../web/controller/xkt/vo/storeProd/StoreProdResVO.java | 2 ++ .../ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java | 3 +++ xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java | 5 +++++ .../java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java | 3 +++ .../java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java | 4 +++- xkt/src/main/java/com/ruoyi/xkt/mapper/StoreColorMapper.java | 2 +- .../com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java | 4 ++-- xkt/src/main/resources/mapper/StoreColorMapper.xml | 2 +- xkt/src/main/resources/mapper/StoreProductFileMapper.xml | 1 + 10 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java index ef3fbb593..507dc5c5a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java @@ -79,7 +79,7 @@ public class StoreProductController extends XktBaseController { /** * 新增档口商品 */ -// @PreAuthorize("@ss.hasPermi('system:product:add')") + @PreAuthorize("@ss.hasPermi('system:product:add')") @Log(title = "档口商品", businessType = BusinessType.INSERT) @ApiOperation(value = "新增档口商品", httpMethod = "POST", response = R.class) @PostMapping diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java index f57ab476c..2805b20cd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java @@ -31,6 +31,8 @@ public class StoreProdResVO { @ApiModelProperty("档口商品名称") private Long storeProdId; + @ApiModelProperty("档口ID") + private Long storeId; @ApiModelProperty("档口商品名称") private String prodName; @ApiModelProperty(name = "商品分类ID") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java index d7821107b..94f6ea24d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdVO.java @@ -33,6 +33,9 @@ public class StoreProdVO { @ApiModelProperty("档口商品名称") private String prodName; + @ApiModelProperty(name = "档口ID") + @NotNull(message = "档口ID不能为空!") + private Long storeId; @ApiModelProperty(name = "商品分类ID") @NotNull(message = "商品分类ID不能为空!") private Long prodCateId; diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java index d5eee1802..7e517adb1 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java @@ -31,6 +31,11 @@ public class StoreProduct extends XktBaseEntity { @TableId private Long storeProdId; + /** + * 档口ID + */ + private Long storeId; + /** * 档口商品名称 */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java index bf99294a2..76b1f0ade 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdDTO.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -29,6 +30,8 @@ public class StoreProdDTO { @ApiModelProperty("档口商品名称") private String prodName; + @ApiModelProperty(name = "档口ID") + private Long storeId; @ApiModelProperty(name = "商品分类ID") private Long prodCateId; @ApiModelProperty(name = "工厂货号") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java index c7154d681..6b7e65c64 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdResDTO.java @@ -25,8 +25,10 @@ import java.util.List; @Data public class StoreProdResDTO { - @ApiModelProperty("档口商品名称") + @ApiModelProperty("档口商品ID") private Long storeProdId; + @ApiModelProperty("档口ID") + private Long storeId; @ApiModelProperty("档口商品名称") private String prodName; @ApiModelProperty(name = "商品分类ID") diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreColorMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreColorMapper.java index 6f33d271c..2f1ed62fe 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreColorMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreColorMapper.java @@ -61,6 +61,6 @@ public interface StoreColorMapper extends BaseMapper { */ public int deleteStoreColorByStoreColorIds(Long[] storeColorIds); - List selectListByStoreProdId(Long storeProdId); + List selectListByStoreProdId(Long storeId); } 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 0a55acd3d..ef27faf0d 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 @@ -66,7 +66,7 @@ public class StoreProductServiceImpl implements IStoreProductService { List cateAttrList = this.storeProdCateAttrMapper.selectListByStoreProdId(storeProdId); storeProdResDTO.setCateAttrList(CollectionUtils.isEmpty(cateAttrList) ? new ArrayList<>() : BeanUtil.copyToList(cateAttrList, StoreProdCateAttrDTO.class)); // 档口所有颜色列表 - List allColorList = this.storeColorMapper.selectListByStoreProdId(storeProdId); + List allColorList = this.storeColorMapper.selectListByStoreProdId(storeProd.getStoreId()); storeProdResDTO.setAllColorList(CollectionUtils.isEmpty(allColorList) ? new ArrayList<>() : BeanUtil.copyToList(allColorList, StoreColorDTO.class)); // 档口当前商品颜色列表 List colorList = this.storeProdColorMapper.selectListByStoreProdId(storeProdId); @@ -74,7 +74,7 @@ public class StoreProductServiceImpl implements IStoreProductService { // 档口颜色价格列表 List priceList = this.storeProdColorPriceMapper.selectListByStoreProdId(storeProdId); storeProdResDTO.setPriceList(CollectionUtils.isEmpty(priceList) ? new ArrayList<>() : BeanUtil.copyToList(priceList, StoreProdColorPriceDTO.class)); - // 档口详情 + // 档口商品详情 StoreProductDetail prodDetail = this.storeProdDetailMapper.selectByStoreProdId(storeProdId); storeProdResDTO.setDetail(ObjectUtils.isEmpty(prodDetail) ? null : BeanUtil.toBean(prodDetail, StoreProdDetailDTO.class)); // 档口服务承诺 diff --git a/xkt/src/main/resources/mapper/StoreColorMapper.xml b/xkt/src/main/resources/mapper/StoreColorMapper.xml index 67eabb874..0c42e1144 100644 --- a/xkt/src/main/resources/mapper/StoreColorMapper.xml +++ b/xkt/src/main/resources/mapper/StoreColorMapper.xml @@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order_num AS orderNum FROM store_color - WHERE del_flag = 0 AND store_prod_id = #{storeProdId} + WHERE del_flag = 0 AND store_id = #{storeId} diff --git a/xkt/src/main/resources/mapper/StoreProductFileMapper.xml b/xkt/src/main/resources/mapper/StoreProductFileMapper.xml index 58746e169..bdc561052 100644 --- a/xkt/src/main/resources/mapper/StoreProductFileMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductFileMapper.xml @@ -110,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sf.file_url AS fileUrl, spf.file_type AS fileType, sf.file_name AS fileName, + spf.file_size AS fileSize, spf.order_num AS orderNum FROM store_product_file spf