From 37f6d6b2d95218f65bc4e922b48d77d526e94bf9 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 10 Jul 2025 17:38:48 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=8C=97=E5=A4=A7=E5=88=86=E6=94=AF?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E9=83=A8=E5=88=86=E4=B9=90=E5=AD=A6?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hzs/common/core/enums/ESpecialArea.java | 6 +++--- .../src/main/java/com/hzs/common/core/enums/ETradeType.java | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java index 56d039b0..5a8573cd 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java @@ -44,17 +44,17 @@ public enum ESpecialArea { /** * 注册专区 */ - SPECIAL_REGISTER_AREA(24, "乐学注册专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 24, 1, EMenuDetail.REGISTER_LXYK.getValue()), + SPECIAL_REGISTER_AREA(24, "乐学注册专区", 1, 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, "乐学升级专区", 1, EnumsPrefixConstants.SPECIAL_AREA + 25, 2, EMenuDetail.UPGRADE_LXYK.getValue()), /** * 乐学甄选 */ - SPECIAL_REPURCHASE_AREA(26, "乐学甄选", 0, EnumsPrefixConstants.SPECIAL_AREA + 26, 6, EMenuDetail.REPURCHASE_LXYK.getValue()), + SPECIAL_REPURCHASE_AREA(26, "乐学甄选", 1, EnumsPrefixConstants.SPECIAL_AREA + 26, 6, EMenuDetail.REPURCHASE_LXYK.getValue()), /** * 续约专区 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java index d4316b17..e354911d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java @@ -19,9 +19,6 @@ public enum ETradeType { REPURCHASE_ORDER(103, 0, "复购订单", 0, EnumsPrefixConstants.TRADE_TYPE + 103, EOrderType.REPURCHASE_ORDER.getValue()), PICK_ORDER(108, 0, "提货订单", 0, EnumsPrefixConstants.TRADE_TYPE + 108, EOrderType.PICK_ORDER.getValue()), CONSUME_ORDER(110, 0, "消费订单", 0, EnumsPrefixConstants.TRADE_TYPE + 110, EOrderType.CONSUME_ORDER.getValue()), - SPECIAL_REGISTER_ORDER(124, 0, "乐学易考注册订单", 0, EnumsPrefixConstants.TRADE_TYPE + 124, EOrderType.SPECIAL_REGISTER_ORDER.getValue()), - SPECIAL_UPGRADE_ORDER(125, 0, "乐学易考升级订单", 0, EnumsPrefixConstants.TRADE_TYPE + 125, EOrderType.SPECIAL_UPGRADE_ORDER.getValue()), - SPECIAL_REPURCHASE_ORDER(126, 0, "乐学易考复购订单", 0, EnumsPrefixConstants.TRADE_TYPE + 126, EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()), RENEWAL_ORDER(129, 0, "续约订单", 0, EnumsPrefixConstants.TRADE_TYPE + 129, EOrderType.RENEWAL_ORDER.getValue()), @@ -67,9 +64,6 @@ public enum ETradeType { REVOKE_REPURCHASE_ORDER(604, 0, "复购订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 604, -EOrderType.REPURCHASE_ORDER.getValue()), REVOKE_PICK_ORDER(609, 0, "提货订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 609, -EOrderType.PICK_ORDER.getValue()), REVOKE_CONSUME_ORDER(611, 0, "消费订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 611, -EOrderType.CONSUME_ORDER.getValue()), - REVOKE_SPECIAL_REGISTER_ORDER(622, 0, "乐学易考注册订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 622, -EOrderType.SPECIAL_REGISTER_ORDER.getValue()), - REVOKE_SPECIAL_UPGRADE_ORDER(623, 0, "乐学易考升级订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 623, -EOrderType.SPECIAL_UPGRADE_ORDER.getValue()), - REVOKE_SPECIAL_REPURCHASE_ORDER(624, 0, "乐学易考复购订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 624, -EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()), REVOKE_RENEWAL_ORDER(629, 0, "续约订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 629, -EOrderType.RENEWAL_ORDER.getValue()), REVOKE_RETAIL_TICKET_ORDER(645, 0, "自主购票撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 645, -EOrderType.RETAIL_TICKET.getValue()), ORDER_SELF_DELIVER(680, 0, "自提返还邮费", 0, EnumsPrefixConstants.TRADE_TYPE + 680, -99),