From 453ce470ed2b6be71287e1ec098223d3c9fa4efe Mon Sep 17 00:00:00 2001 From: wuKong Date: Tue, 30 Dec 2025 11:24:27 +0800 Subject: [PATCH] =?UTF-8?q?refactor(promotion):=20=E5=B0=86=E8=A3=85?= =?UTF-8?q?=E4=BF=AE=E6=A8=A1=E6=9D=BF=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BB=8Etype=E6=94=B9=E4=B8=BAplatform?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改AppDiyTemplateController中getUsedDiyTemplate方法参数名从type改为platform - 更新DiyTemplateMapper中相关方法参数命名和注释 - 调整selectAppByUsed方法中参数名称和逻辑注释 - 修改DiyTemplateService接口中方法参数命名 - 更新DiyTemplateServiceImpl实现类中方法参数名称 --- .../app/diy/AppDiyTemplateController.java | 7 ++++--- .../dal/mysql/diy/DiyTemplateMapper.java | 20 +++++++++---------- .../service/diy/DiyTemplateService.java | 2 +- .../service/diy/DiyTemplateServiceImpl.java | 4 ++-- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/diy/AppDiyTemplateController.java b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/diy/AppDiyTemplateController.java index 026202e37..565155211 100644 --- a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/diy/AppDiyTemplateController.java +++ b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/diy/AppDiyTemplateController.java @@ -38,10 +38,11 @@ public class AppDiyTemplateController { // TODO @疯狂：要不要把 used 和 get 接口合并哈；不传递 id，直接拿默认； @GetMapping("/used") @Operation(summary = "使用中的装修模板") - @Parameter(name = "type", description = "装修模板类型", example = "1024") + @Parameter(name = "platform", description = "装修模板平台", example = "1024") @PermitAll - public CommonResult getUsedDiyTemplate(@RequestParam(value = "type", required = false) String type) { - DiyTemplateDO diyTemplate = diyTemplateService.getUsedDiyTemplate(type); + public CommonResult getUsedDiyTemplate(@RequestParam(value = "platform", + required = false) String platform) { + DiyTemplateDO diyTemplate = diyTemplateService.getUsedDiyTemplate(platform); return success(buildVo(diyTemplate)); } diff --git a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/diy/DiyTemplateMapper.java b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/diy/DiyTemplateMapper.java index 37b71c6d1..12b591d81 100644 --- a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/diy/DiyTemplateMapper.java +++ b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/diy/DiyTemplateMapper.java @@ -31,19 +31,19 @@ public interface DiyTemplateMapper extends BaseMapperX { default DiyTemplateDO selectByUsed(boolean used) { return selectOne(DiyTemplateDO::getUsed, used); } - default DiyTemplateDO selectByUsed(boolean used, String type) { - return selectOne(DiyTemplateDO::getUsed, used, DiyTemplateDO::getPlatform, type); + default DiyTemplateDO selectByUsed(boolean used, String platform) { + return selectOne(DiyTemplateDO::getUsed, used, DiyTemplateDO::getPlatform, platform); } - default DiyTemplateDO selectAppByUsed(boolean used, String type) { - // 1. 没传类型查默认类型，默认类型找不到，取最近一次使用的模板 - if (ObjectUtil.isEmpty(type)) { - DiyTemplateDO defaultTemplate = selectByUsed(used, DiyTemplatePlatformEnum.DEFAULT.getPlatform()); - return ObjectUtil.isNotEmpty(defaultTemplate) ? defaultTemplate : lastUsedTemplate(true); + default DiyTemplateDO selectAppByUsed(boolean used, String platform) { + // 1. 没传值找默认，没找到，取最近一次使用的模板 + if (ObjectUtil.isNull(platform)) { + DiyTemplateDO defaultDiyTemplate = selectByUsed(used, DiyTemplatePlatformEnum.DEFAULT.getPlatform()); + return ObjectUtil.isNotEmpty(defaultDiyTemplate) ? defaultDiyTemplate : lastUsedTemplate(true); } - // 2. 传了类型根据类型查询，没找到，取默认类型 - DiyTemplateDO typedTemplate = selectByUsed(used, type); - return ObjectUtil.isNotEmpty(typedTemplate) ? typedTemplate : selectByUsed(true, DiyTemplatePlatformEnum.DEFAULT.getPlatform()); + // 2. 有传值，没找到，取默认 + DiyTemplateDO diyTemplate = selectByUsed(used, platform); + return ObjectUtil.isNotEmpty(diyTemplate) ? diyTemplate : selectByUsed(true, DiyTemplatePlatformEnum.DEFAULT.getPlatform()); } default DiyTemplateDO lastUsedTemplate(boolean used) { diff --git a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/diy/DiyTemplateService.java b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/diy/DiyTemplateService.java index e9b475447..0173d51b0 100644 --- a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/diy/DiyTemplateService.java +++ b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/diy/DiyTemplateService.java @@ -72,6 +72,6 @@ public interface DiyTemplateService { * * @return 装修模板 */ - DiyTemplateDO getUsedDiyTemplate(String type); + DiyTemplateDO getUsedDiyTemplate(String platform); } diff --git a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/diy/DiyTemplateServiceImpl.java b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/diy/DiyTemplateServiceImpl.java index c2b4bba00..7d3d5fb6c 100644 --- a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/diy/DiyTemplateServiceImpl.java +++ b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/diy/DiyTemplateServiceImpl.java @@ -164,8 +164,8 @@ public class DiyTemplateServiceImpl implements DiyTemplateService { } @Override - public DiyTemplateDO getUsedDiyTemplate(String type) { - return diyTemplateMapper.selectAppByUsed(true, type); + public DiyTemplateDO getUsedDiyTemplate(String platform) { + return diyTemplateMapper.selectAppByUsed(true, platform); } }