diff --git a/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/diy/DiyTemplateTypeEnum.java b/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/diy/DiyTemplatePlatformEnum.java similarity index 81% rename from yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/diy/DiyTemplateTypeEnum.java rename to yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/diy/DiyTemplatePlatformEnum.java index 45792e26e..82ee77fb8 100644 --- a/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/diy/DiyTemplateTypeEnum.java +++ b/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/diy/DiyTemplatePlatformEnum.java @@ -7,14 +7,14 @@ import lombok.Getter; import java.util.Arrays; /** - * 模板类型枚举 + * 模板平台 * uniPlatform * @author wuKong */ @AllArgsConstructor @Getter -public enum DiyTemplateTypeEnum implements ArrayValuable { - DEFAULT("default","默认"), +public enum DiyTemplatePlatformEnum implements ArrayValuable { + DEFAULT("","默认"), APP("app", "App"), WEB("web", "Web"), MP_WEIXIN("mp-weixin", "微信小程序"), @@ -30,17 +30,17 @@ public enum DiyTemplateTypeEnum implements ArrayValuable { QUICKAPP_WEBVIEW("quickapp-webview", "快应用通用(包含联盟、华为)"), QUICKAPP_WEBVIEW_UNION("quickapp-webview-union", "快应用联盟"), QUICKAPP_WEBVIEW_HUAWEI("quickapp-webview-huawei", "快应用华为"), - //OTHER_VUSINESS_SCEN("other-business-scen", "其他自定义业务场景"), + //OTHER_BUSINESS_SCEN("other-business-scen", "其他自定义业务场景"), ; private static final String[] ARRAYS = - Arrays.stream(values()).map(DiyTemplateTypeEnum::getType).toArray(String[]::new); + Arrays.stream(values()).map(DiyTemplatePlatformEnum::getPlatform).toArray(String[]::new); /** * type * 可以是uniPlatform * 也可以是其他自定义的业务场景 */ - private final String type; + private final String platform; /** * name 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 4d890f55f..177f74ec8 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,7 +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 cn.iocoder.yudao.module.promotion.enums.diy.DiyTemplatePlatformEnum; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; import lombok.Data; @@ -25,9 +25,8 @@ public class DiyTemplateBaseVO { @Schema(description = "预览图", example = "[https://www.iocoder.cn/1.jpg]") private List previewPicUrls; - @Schema(description = "模板类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "默认") - @NotEmpty(message = "模板类型不能为空") - @InEnum(DiyTemplateTypeEnum.class) - private String type; + @Schema(description = "模板平台", requiredMode = Schema.RequiredMode.REQUIRED, example = "默认") + @InEnum(DiyTemplatePlatformEnum.class) + private String platform; } diff --git a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/diy/vo/template/DiyTemplatePageReqVO.java b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/diy/vo/template/DiyTemplatePageReqVO.java index c25b5fcb2..9e4e9606f 100644 --- a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/diy/vo/template/DiyTemplatePageReqVO.java +++ b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/diy/vo/template/DiyTemplatePageReqVO.java @@ -20,8 +20,8 @@ public class DiyTemplatePageReqVO extends PageParam { @Schema(description = "模板名称", example = "默认主题") private String name; - @Schema(description = "模板类型", example = "默认") - private String type; + @Schema(description = "模板平台", example = "默认") + private String platform; @Schema(description = "是否使用", example = "true") private Boolean used; diff --git a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/diy/DiyTemplateDO.java b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/diy/DiyTemplateDO.java index f0ae1fa9b..2b06688bb 100644 --- a/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/diy/DiyTemplateDO.java +++ b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/diy/DiyTemplateDO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.promotion.dal.dataobject.diy; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.framework.mybatis.core.type.StringListTypeHandler; -import cn.iocoder.yudao.module.promotion.enums.diy.DiyTemplateTypeEnum; +import cn.iocoder.yudao.module.promotion.enums.diy.DiyTemplatePlatformEnum; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -40,10 +40,10 @@ public class DiyTemplateDO extends BaseDO { */ private String name; /** - * 模板类型 - * {@link DiyTemplateTypeEnum} + * 模板平台 + * {@link DiyTemplatePlatformEnum} */ - private String type; + private String platform; /** * 是否使用 */ 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 bc776bd85..37b71c6d1 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,7 +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 cn.iocoder.yudao.module.promotion.enums.diy.DiyTemplatePlatformEnum; import org.apache.ibatis.annotations.Mapper; /** @@ -21,7 +21,7 @@ public interface DiyTemplateMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(DiyTemplateDO::getName, reqVO.getName()) .eqIfPresent(DiyTemplateDO::getUsed, reqVO.getUsed()) - .eqIfPresent(DiyTemplateDO::getType, reqVO.getType()) + .eqIfPresent(DiyTemplateDO::getPlatform, reqVO.getPlatform()) .betweenIfPresent(DiyTemplateDO::getUsedTime, reqVO.getUsedTime()) .betweenIfPresent(DiyTemplateDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(DiyTemplateDO::getUsed) // 排序规则1:已使用的排到最前面 @@ -32,18 +32,18 @@ public interface DiyTemplateMapper extends BaseMapperX { return selectOne(DiyTemplateDO::getUsed, used); } default DiyTemplateDO selectByUsed(boolean used, String type) { - return selectOne(DiyTemplateDO::getUsed, used, DiyTemplateDO::getType, type); + return selectOne(DiyTemplateDO::getUsed, used, DiyTemplateDO::getPlatform, type); } default DiyTemplateDO selectAppByUsed(boolean used, String type) { // 1. 没传类型查默认类型,默认类型找不到,取最近一次使用的模板 if (ObjectUtil.isEmpty(type)) { - DiyTemplateDO defaultTemplate = selectByUsed(used, DiyTemplateTypeEnum.DEFAULT.getType()); + DiyTemplateDO defaultTemplate = selectByUsed(used, DiyTemplatePlatformEnum.DEFAULT.getPlatform()); return ObjectUtil.isNotEmpty(defaultTemplate) ? defaultTemplate : lastUsedTemplate(true); } // 2. 传了类型根据类型查询,没找到,取默认类型 DiyTemplateDO typedTemplate = selectByUsed(used, type); - return ObjectUtil.isNotEmpty(typedTemplate) ? typedTemplate : selectByUsed(true, DiyTemplateTypeEnum.DEFAULT.getType()); + return ObjectUtil.isNotEmpty(typedTemplate) ? typedTemplate : 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/DiyTemplateServiceImpl.java b/yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/diy/DiyTemplateServiceImpl.java index d198b4599..c2b4bba00 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 @@ -128,7 +128,7 @@ public class DiyTemplateServiceImpl implements DiyTemplateService { DiyTemplateDO diyTemplateDO = validateDiyTemplateExists(id); // TODO @疯狂:要不已使用的情况,抛个业务异常? // 已使用的更新为未使用,加入模板类型判断 - DiyTemplateDO used = diyTemplateMapper.selectByUsed(true, diyTemplateDO.getType()); + DiyTemplateDO used = diyTemplateMapper.selectByUsed(true, diyTemplateDO.getPlatform()); if (used != null) { // 如果 id 相同,说明未发生变化 if (used.getId().equals(id)) {