diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java index 7d130818..2d792823 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java @@ -19,12 +19,12 @@ public enum EOrderType { /** * 注册订单 */ - REGISTER_ORDER(1, "注册订单", 0, EnumsPrefixConstants.ORDER_TYPE + 1), + REGISTER_ORDER(1, "旧注册订单", 0, EnumsPrefixConstants.ORDER_TYPE + 1), /** * 升级订单 */ - UPGRADE_ORDER(2, "升级订单", 0, EnumsPrefixConstants.ORDER_TYPE + 2), + UPGRADE_ORDER(2, "旧升级订单", 0, EnumsPrefixConstants.ORDER_TYPE + 2), /** * 复购订单 @@ -57,19 +57,19 @@ public enum EOrderType { SECOND_ORDER(23, "二次发货", 0, EnumsPrefixConstants.ORDER_TYPE + 23), /** - * 乐学注册 + * 乐学注册订单 */ - SPECIAL_REGISTER_ORDER(24, "乐学注册订单", 0, EnumsPrefixConstants.ORDER_TYPE + 24), + SPECIAL_REGISTER_ORDER(24, "注册订单", 0, EnumsPrefixConstants.ORDER_TYPE + 24), /** - * 乐学升级 + * 乐学升级订单 */ - SPECIAL_UPGRADE_ORDER(25, "乐学升级订单", 0, EnumsPrefixConstants.ORDER_TYPE + 25), + SPECIAL_UPGRADE_ORDER(25, "升级订单", 0, EnumsPrefixConstants.ORDER_TYPE + 25), /** - * 乐学复购 + * 乐学甄选订单 */ - SPECIAL_REPURCHASE_ORDER(26, "乐学复购订单", 0, EnumsPrefixConstants.ORDER_TYPE + 26), + SPECIAL_REPURCHASE_ORDER(26, "乐学甄选", 0, EnumsPrefixConstants.ORDER_TYPE + 26), /** * 续约订单 diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java index 25d40014..d8b15ebb 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java @@ -13,20 +13,15 @@ import lombok.Getter; @Getter public enum ESpecialArea { -// /** -// * 商品专区 -// // */ -// PRODUCT_AREA(0, "商品专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "0"), - /** * 注册专区 */ - REGISTER_AREA(1, "注册专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "1", 3, EMenuDetail.REGISTER.getValue()), + REGISTER_AREA(1, "旧注册专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "1", 3, EMenuDetail.REGISTER.getValue()), /** * 升级专区 */ - UPGRADE_AREA(2, "升级专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "2", 4, EMenuDetail.UPGRADE.getValue()), + UPGRADE_AREA(2, "旧升级专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "2", 4, EMenuDetail.UPGRADE.getValue()), /** * 复购专区 名字修改为自营专区(复购自营) @@ -101,19 +96,19 @@ public enum ESpecialArea { // COOPERATE_AREA(22, "复购合作", 0, EnumsPrefixConstants.SPECIAL_AREA + 22, 6, EMenuDetail.COOPERATE.getValue()), /** - * 特殊注册 + * 注册专区 */ - SPECIAL_REGISTER_AREA(24, "乐学注册", 0, EnumsPrefixConstants.SPECIAL_AREA + 24, 1, EMenuDetail.REGISTER_LXYK.getValue()), + SPECIAL_REGISTER_AREA(24, "注册专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 24, 1, EMenuDetail.REGISTER_LXYK.getValue()), /** - * 特殊升级 + * 升级专区 */ - SPECIAL_UPGRADE_AREA(25, "乐学升级", 0, EnumsPrefixConstants.SPECIAL_AREA + 25, 2, EMenuDetail.UPGRADE_LXYK.getValue()), + SPECIAL_UPGRADE_AREA(25, "升级专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 25, 2, EMenuDetail.UPGRADE_LXYK.getValue()), /** - * 特殊复购 + * 乐学甄选 */ - SPECIAL_REPURCHASE_AREA(26, "乐学复购", 0, EnumsPrefixConstants.SPECIAL_AREA + 26, 3, EMenuDetail.REPURCHASE_LXYK.getValue()), + SPECIAL_REPURCHASE_AREA(26, "乐学甄选", 0, EnumsPrefixConstants.SPECIAL_AREA + 26, 3, EMenuDetail.REPURCHASE_LXYK.getValue()), // /** // * 海粉升级