From 444d1af15abf30e198e94553f8a8935b0e645d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=85=E6=99=A8?= <136767481@qq.com> Date: Fri, 18 Apr 2025 09:28:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(mall):=20=E4=BF=AE=E6=94=B9=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 TzProd、TzProdBo 和 TzProdVo 中的 categoryId 类型从 Long 改为 String - 修改 TzProdServiceImpl 中的 pageByCategoryId 方法，使用 like 查询替代 in 查询 - 更新 TzProdServiceImpl 中的条件查询逻辑，使用 like 查询替代 eq 查询 - 移除 WxXcxUtils 中的冗余注释代码 --- .../java/org/dromara/web/common/WxXcxUtils.java | 3 --- .../main/java/org/dromara/mall/domain/TzProd.java | 2 +- .../java/org/dromara/mall/domain/bo/TzProdBo.java | 2 +- .../java/org/dromara/mall/domain/vo/TzProdVo.java | 2 +- .../mall/service/impl/TzProdServiceImpl.java | 14 ++++++++++++-- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ruoyi-mall-api/src/main/java/org/dromara/web/common/WxXcxUtils.java b/ruoyi-mall-api/src/main/java/org/dromara/web/common/WxXcxUtils.java index e6ed45a..bee07b6 100644 --- a/ruoyi-mall-api/src/main/java/org/dromara/web/common/WxXcxUtils.java +++ b/ruoyi-mall-api/src/main/java/org/dromara/web/common/WxXcxUtils.java @@ -29,9 +29,6 @@ public class WxXcxUtils { String result = HttpRequest.post(url).body(json.toString()).execute().body(); JSONObject jsonObject = JSONObject.parseObject(result); - /*JSONObject phoneInfo = jsonObject.getJSONObject("phone_info"); - System.out.println(phoneInfo+"=================================="); - String phoneNumber = phoneInfo.get("phoneNumber").toString();*/ return jsonObject; } 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 a96a0ca..05b67c7 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 @@ -124,7 +124,7 @@ public class TzProd extends TenantEntity { /** * 商品分类 */ - private Long categoryId; + private String categoryId; /** * 商品参数json 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 7a92ac5..cf2f951 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 @@ -130,7 +130,7 @@ public class TzProdBo extends TenantEntity { /** * 商品分类 */ - private Long categoryId; + private String categoryId; /** * 商品参数json 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 f7ba747..50effa1 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 @@ -145,7 +145,7 @@ public class TzProdVo implements Serializable { * 商品分类 */ @ExcelProperty(value = "商品分类") - private Long categoryId; + private String categoryId; /** * 商品参数json diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdServiceImpl.java index aa99d4c..3e952e3 100644 --- a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdServiceImpl.java +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdServiceImpl.java @@ -105,7 +105,17 @@ public class TzProdServiceImpl extends MPJBaseServiceImpl i */ @Override public IPage pageByCategoryId(PageQuery pageQuery, List categoryId) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper().eq(TzProd::getStatus,1).in(categoryId != null,TzProd::getCategoryId,categoryId); + // 构造查询条件 + LambdaQueryWrapper lqw = new LambdaQueryWrapper() + .eq(TzProd::getStatus, 1) + .and(wrapper -> { + for (Long id : categoryId) { + wrapper.or(w -> w.like(TzProd::getCategoryId, String.valueOf(id))); + } + }) + .orderByDesc(TzProd::getPutawayTime); + + // 执行分页查询 return baseMapper.selectVoPage(pageQuery.build(), lqw); } @@ -171,7 +181,7 @@ public class TzProdServiceImpl 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.eq(bo.getCategoryId() != null, TzProd::getCategoryId, bo.getCategoryId()); + lqw.like(bo.getCategoryId() != null, TzProd::getCategoryId, bo.getCategoryId()); lqw.between(params.get("beginTime") != null && params.get("endTime") != null, TzProd::getPutawayTime, params.get("beginTime"), params.get("endTime")); return lqw;