From ad2776df97e4f378b0fdf154381da63a3387fb41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=85=E6=99=A8?= <136767481@qq.com> Date: Mon, 12 May 2025 10:02:27 +0800 Subject: [PATCH] =?UTF-8?q?refactor(mall):=20=E6=9B=B4=E6=96=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=B1=BB=E7=9B=AE=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 - 更新 ruoyi-admin 和 ruoyi-mall-api 项目的数据库配置，使用新的数据库连接信息 - 修改 TzCategoryServiceImpl 中的 listByParentId 方法，增加对子集状态的查询条件 --- ruoyi-admin/src/main/resources/application-dev.yml | 6 +++--- ruoyi-admin/src/main/resources/application-prod.yml | 6 +++--- ruoyi-mall-api/src/main/resources/application-dev.yml | 6 +++--- ruoyi-mall-api/src/main/resources/application-prod.yml | 6 +++--- .../dromara/mall/service/impl/TzCategoryServiceImpl.java | 4 +--- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index d85cf99..4926794 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -52,9 +52,9 @@ spring: # url: jdbc:mysql://localhost:3306/jcs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # username: root # password: root - url: jdbc:mysql://erp9.52o.site:13308/jcs20250106?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: jcs20250106 - password: esXkafdSMsxRAkNe + url: jdbc:mysql://erp9.52o.site:13308/jcs20250512?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: jcs20250512 + password: rdnGT3TFYFnMzstX # 从库数据源 slave: lazy: false diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index a8c87b7..6420e5e 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -55,9 +55,9 @@ spring: # url: jdbc:mysql://localhost:3306/cailiao?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # username: root # password: root - url: jdbc:mysql://124.223.56.113:13306/cailiao1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: cailiao1 - password: j5RcfMwRG2WMHyAC + url: jdbc:mysql://erp9.52o.site:13308/jcs20250512?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: jcs20250512 + password: rdnGT3TFYFnMzstX # 从库数据源 slave: lazy: false diff --git a/ruoyi-mall-api/src/main/resources/application-dev.yml b/ruoyi-mall-api/src/main/resources/application-dev.yml index 735d342..889db10 100644 --- a/ruoyi-mall-api/src/main/resources/application-dev.yml +++ b/ruoyi-mall-api/src/main/resources/application-dev.yml @@ -52,9 +52,9 @@ spring: # url: jdbc:mysql://localhost:3306/jcs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # username: root # password: root - url: jdbc:mysql://erp9.52o.site:13308/jcs20250106?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: jcs20250106 - password: esXkafdSMsxRAkNe + url: jdbc:mysql://erp9.52o.site:13308/jcs20250512?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: jcs20250512 + password: rdnGT3TFYFnMzstX # 从库数据源 slave: lazy: false diff --git a/ruoyi-mall-api/src/main/resources/application-prod.yml b/ruoyi-mall-api/src/main/resources/application-prod.yml index 4593a6e..19fa9e2 100644 --- a/ruoyi-mall-api/src/main/resources/application-prod.yml +++ b/ruoyi-mall-api/src/main/resources/application-prod.yml @@ -55,9 +55,9 @@ spring: # url: jdbc:mysql://localhost:3306/cailiao?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # username: root # password: root - url: jdbc:mysql://localhost:3306/jcs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: root - password: root + url: jdbc:mysql://erp9.52o.site:13308/jcs20250512?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: jcs20250512 + password: rdnGT3TFYFnMzstX # 从库数据源 slave: lazy: false diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCategoryServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCategoryServiceImpl.java index e0923de..bc1e91d 100644 --- a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCategoryServiceImpl.java +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCategoryServiceImpl.java @@ -103,8 +103,6 @@ public class TzCategoryServiceImpl implements ITzCategoryService { return baseMapper.updateById(update) > 0; } - - /** * 校验并批量删除产品类目信息 * @@ -119,7 +117,7 @@ public class TzCategoryServiceImpl implements ITzCategoryService { @Override public List listByParentId(Long parentId) { - return baseMapper.selectVoList(new LambdaQueryWrapper().eq(TzCategory::getParentId, parentId).eq(TzCategory::getStatus,1)); + return baseMapper.selectVoList(new LambdaQueryWrapper().eq(TzCategory::getParentId, parentId).eq(TzCategory::getStatus,1).eq(TzCategory::getSubset,1)); } /**