From 57063b44b0951251def365172938b52a0f9f54d6 Mon Sep 17 00:00:00 2001
From: wuKong <crossdream@sina.cn>
Date: Mon, 29 Dec 2025 18:20:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(promotion):=20=E6=B7=BB=E5=8A=A0DIY?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在DiyTemplateBaseVO中添加DiyTemplateTypeEnum枚举验证注解
- 将硬编码的"default"字符串替换为DiyTemplateTypeEnum.DEFAULT.getType()
- 统一模板类型的枚举管理，提高代码类型安全性
---
 .../controller/admin/diy/vo/template/DiyTemplateBaseVO.java  | 3 +++
 .../module/promotion/dal/mysql/diy/DiyTemplateMapper.java    | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/diy/vo/template/DiyTemplateBaseVO.java b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/diy/vo/template/DiyTemplateBaseVO.java
index 3f43f6c7a..4d890f55f 100644
--- a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/diy/vo/template/DiyTemplateBaseVO.java
+++ b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/diy/vo/template/DiyTemplateBaseVO.java
@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.promotion.controller.admin.diy.vo.template;
 
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.promotion.enums.diy.DiyTemplateTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
@@ -25,6 +27,7 @@ public class DiyTemplateBaseVO {
 
     @Schema(description = "模板类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "默认")
     @NotEmpty(message = "模板类型不能为空")
+    @InEnum(DiyTemplateTypeEnum.class)
     private String type;
 
 }
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 e547a6976..bc776bd85 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
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.promotion.controller.admin.diy.vo.template.DiyTemplatePageReqVO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.diy.DiyTemplateDO;
+import cn.iocoder.yudao.module.promotion.enums.diy.DiyTemplateTypeEnum;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -37,12 +38,12 @@ public interface DiyTemplateMapper extends BaseMapperX<DiyTemplateDO> {
     default DiyTemplateDO selectAppByUsed(boolean used, String type) {
         // 1. 没传类型查默认类型，默认类型找不到，取最近一次使用的模板
         if (ObjectUtil.isEmpty(type)) {
-            DiyTemplateDO defaultTemplate = selectByUsed(used, "default");
+            DiyTemplateDO defaultTemplate = selectByUsed(used, DiyTemplateTypeEnum.DEFAULT.getType());
             return ObjectUtil.isNotEmpty(defaultTemplate) ? defaultTemplate : lastUsedTemplate(true);
         }
         // 2. 传了类型根据类型查询，没找到，取默认类型
         DiyTemplateDO typedTemplate = selectByUsed(used, type);
-        return ObjectUtil.isNotEmpty(typedTemplate) ? typedTemplate : selectByUsed(true, "default");
+        return ObjectUtil.isNotEmpty(typedTemplate) ? typedTemplate : selectByUsed(true, DiyTemplateTypeEnum.DEFAULT.getType());
     }
 
     default DiyTemplateDO lastUsedTemplate(boolean used) {