From 5452cdced67413d020cb7193898fef9e75e49902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=85=E6=99=A8?= <136767481@qq.com> Date: Wed, 14 May 2025 10:19:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(mall):=20=E6=B7=BB=E5=8A=A0=E5=95=86?= =?UTF-8?q?=E5=93=81=E7=8E=AF=E4=BF=9D=E7=AD=89=E7=BA=A7=E3=80=81=E9=98=B2?= =?UTF-8?q?=E7=81=AB=E7=AD=89=E7=BA=A7=E5=92=8C=E8=AF=95=E7=94=A8=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 TzProd 和 TzProdBo 模型中添加环保等级、防火等级和试用场景字段 - 在 HyBasketVo 中添加指导价字段 - 更新 TzProdController 和 TzProdServiceImpl 以支持新属性的查询 --- .../mall/controller/TzProdController.java | 3 --- .../java/org/dromara/mall/domain/TzProd.java | 15 +++++++++++++++ .../org/dromara/mall/domain/bo/TzProdBo.java | 15 +++++++++++++++ .../org/dromara/mall/domain/vo/HyBasketVo.java | 6 ++++++ .../org/dromara/mall/domain/vo/TzProdVo.java | 15 +++++++++++++++ .../mall/service/impl/HyBasketServiceImpl.java | 1 + .../mall/service/impl/TzProdServiceImpl.java | 16 +++++++++++++++- 7 files changed, 67 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdController.java index 02f2654..381306c 100644 --- a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdController.java +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdController.java @@ -22,7 +22,6 @@ import org.dromara.mall.domain.bo.TzSkuBo; import org.dromara.mall.domain.vo.TzProdSumVo; import org.dromara.mall.domain.vo.TzProdVo; import org.dromara.mall.service.ITzProdService; -import org.dromara.mall.service.ITzSkuService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -42,8 +41,6 @@ public class TzProdController extends BaseController { private final ITzProdService tzProdService; - private final ITzSkuService tzSkuService; - /** * 查询商品列表 */ diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProd.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProd.java index 05b67c7..68c7493 100644 --- a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProd.java +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProd.java @@ -212,4 +212,19 @@ public class TzProd extends TenantEntity { */ private String remark; + /** + * 环保等级 + */ + private String envLevel; + + /** + * 防火等级 + */ + private String fireLevel; + + /** + * 试用场景 + */ + private String trialScenario; + } diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdBo.java index cf2f951..57a4c81 100644 --- a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdBo.java +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdBo.java @@ -217,4 +217,19 @@ public class TzProdBo extends TenantEntity { */ private String remark; + /** + * 环保等级(查询多值时逗号隔开) + */ + private String envLevel; + + /** + * 防火等级(查询多值时逗号隔开) + */ + private String fireLevel; + + /** + * 试用场景(查询多值时逗号隔开) + */ + private String trialScenario; + } diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyBasketVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyBasketVo.java index 1a0ae56..9fc1e93 100644 --- a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyBasketVo.java +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyBasketVo.java @@ -104,6 +104,12 @@ public class HyBasketVo implements Serializable { @ExcelProperty(value = "SKU图片") private String pic; + /** + * 指导价 + */ + @ExcelProperty(value = "指导价") + private BigDecimal guidingPrice; + /** * SKU成本价格 */ diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdVo.java index 50effa1..e90f8ac 100644 --- a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdVo.java +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdVo.java @@ -289,5 +289,20 @@ public class TzProdVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 环保等级 + */ + private String envLevel; + + /** + * 防火等级 + */ + private String fireLevel; + + /** + * 试用场景 + */ + private String trialScenario; + } diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyBasketServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyBasketServiceImpl.java index 22d85b9..952bb3b 100644 --- a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyBasketServiceImpl.java +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyBasketServiceImpl.java @@ -85,6 +85,7 @@ public class HyBasketServiceImpl extends MPJBaseServiceImpl i lqw.like(StringUtils.isNotBlank(bo.getFactoryAddress()), TzProd::getFactoryAddress, bo.getFactoryAddress()); lqw.eq(bo.getStatus() != null, TzProd::getStatus, bo.getStatus()); lqw.eq(bo.getExamineFlag() != null, TzProd::getExamineFlag, bo.getExamineFlag()); -// lqw.like(bo.getCategoryId() != null, TzProd::getCategoryId, bo.getCategoryId()); + + if(bo.getEnvLevel() != null){ + /*//根据逗号分割解析该字符串 + String[] split = bo.getEnvLevel().split(","); + for (String s : split) { + lqw.or().like(TzProd::getEnvLevel, s); + }*/ + lqw.in(TzProd::getEnvLevel, bo.getEnvLevel()); + } + if(bo.getFireLevel() != null){ + lqw.in(TzProd::getFireLevel, bo.getFireLevel()); + } + if(bo.getTrialScenario() != null){ + lqw.in(TzProd::getTrialScenario, bo.getTrialScenario()); + } if(bo.getCategoryId() != null){ lqw.or().apply("FIND_IN_SET({0}, t.category_id)", bo.getCategoryId()); }