From 32bf18713445799dca94970151239f4f2caf1ae4 Mon Sep 17 00:00:00 2001 From: dzq Date: Tue, 20 May 2025 16:12:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=95=86=E5=93=81):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=95=86=E5=93=81=E4=BD=BF=E7=94=A8=E8=AF=B4=E6=98=8E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在商品相关的DTO、Entity和查询类中添加`usageInstruction`字段，用于存储商品的使用说明信息。同时更新了Mapper中的SQL查询语句，确保该字段在查询结果中返回。 --- .../domain/shop/goods/db/SearchGoodsWithCabinetDO.java | 1 + .../com/agileboot/domain/shop/goods/db/ShopGoodsEntity.java | 3 +++ .../com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java | 6 +++--- .../com/agileboot/domain/shop/goods/dto/ShopGoodsDTO.java | 3 +++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/SearchGoodsWithCabinetDO.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/SearchGoodsWithCabinetDO.java index 72afb65..91a3dc6 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/SearchGoodsWithCabinetDO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/SearchGoodsWithCabinetDO.java @@ -20,6 +20,7 @@ public class SearchGoodsWithCabinetDO extends BaseEntity { @TableField("remark") private String remark; + @ApiModelProperty("商品使用说明") + @TableField("usage_instruction") + private String usageInstruction; @Override public Serializable pkVal() { diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java index 39988f0..d2b4356 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java @@ -36,7 +36,7 @@ public interface ShopGoodsMapper extends BaseMapper { @Param(Constants.WRAPPER) Wrapper queryWrapper ); */ @Select("SELECT g.goods_id, g.goods_name, g.category_id, g.price, " + - "g.stock, g.status, g.auto_approval, g.cover_img, SUM(cc.stock) AS total_stock, " + + "g.stock, g.status, g.auto_approval, g.cover_img, g.usage_instruction, SUM(cc.stock) AS total_stock, " + "GROUP_CONCAT(DISTINCT cc.cell_no) AS cell_no_str, " + "GROUP_CONCAT(DISTINCT sc.cabinet_name) AS cabinet_name " + "FROM shop_goods g " + @@ -63,7 +63,7 @@ public interface ShopGoodsMapper extends BaseMapper { * @return 商品列表 */ @Select("SELECT g.goods_id, g.goods_name, g.category_id, g.price, " + - "g.status, g.cover_img, g.goods_detail, " + + "g.status, g.cover_img, g.goods_detail, g.usage_instruction, " + "g.creator_id, g.create_time, g.updater_id, g.update_time, g.remark, g.deleted, " + "sc.cabinet_id, sc.cabinet_name, cc.stock, cc.cell_id " + "FROM shop_goods g " + @@ -73,7 +73,7 @@ public interface ShopGoodsMapper extends BaseMapper { List getGoodsWithCabinetList(); @Select("SELECT g.goods_id, g.goods_name, g.category_id, g.price, " + - "g.status, g.cover_img, g.goods_detail, " + + "g.status, g.cover_img, g.goods_detail, g.usage_instruction, " + "g.creator_id, g.create_time, g.updater_id, g.update_time, g.remark, g.deleted, " + "sc.cabinet_id, sc.cabinet_name, sc.shop_id, cc.stock, cc.cell_id " + "FROM shop_goods g " + diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/dto/ShopGoodsDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/dto/ShopGoodsDTO.java index c687284..0b5780a 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/dto/ShopGoodsDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/dto/ShopGoodsDTO.java @@ -86,4 +86,7 @@ public class ShopGoodsDTO { private String cellNoStr; @ExcelColumn(name = "已分配库存") private Integer totalStock; + + @ExcelColumn(name = "商品使用说明") + private String usageInstruction; }