## 调整专区名称等；结算时不处理乐学注册、升级等订单；

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java

@@ -417,11 +417,12 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
                 //根据订单状态回退网体,查询撤销订单, 撤销订单不进行结算
                 if (saOrderExt.getDelFlag() == EYesNo.NO.getIntValue()) {
                     if (Objects.equals(EOrderType.REGISTER_ORDER.getValue(), saOrderExt.getOrderType())
-                            || Objects.equals(EOrderType.SPECIAL_REGISTER_ORDER.getValue(), saOrderExt.getOrderType())
+//                            || Objects.equals(EOrderType.SPECIAL_REGISTER_ORDER.getValue(), saOrderExt.getOrderType())
                     ) {
                         revokeRegSaOrderList.add(saOrderExt);
                     } else if (Objects.equals(EOrderType.UPGRADE_ORDER.getValue(), saOrderExt.getOrderType())
-                            || Objects.equals(EOrderType.SPECIAL_UPGRADE_ORDER.getValue(), saOrderExt.getOrderType())) {
+//                            || Objects.equals(EOrderType.SPECIAL_UPGRADE_ORDER.getValue(), saOrderExt.getOrderType())
+                    ) {
                         revokeUpdSaOrderList.add(saOrderExt);
                     }
                     return;
@@ -1011,11 +1012,13 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
                 || Objects.equals(EOrderType.UPGRADE_ORDER.getValue(), saOrderExt.getOrderType())) {
             firPurchaseOrderList.add(saOrderExt);
         } else if (Objects.equals(EOrderType.FICTITIOUS_ORDER.getValue(), saOrderExt.getOrderType())
-                || Objects.equals(EOrderType.SPECIAL_REGISTER_ORDER.getValue(), saOrderExt.getOrderType())
+//                || Objects.equals(EOrderType.SPECIAL_REGISTER_ORDER.getValue(), saOrderExt.getOrderType())
-                || Objects.equals(EOrderType.SPECIAL_UPGRADE_ORDER.getValue(), saOrderExt.getOrderType())) {
+//                || Objects.equals(EOrderType.SPECIAL_UPGRADE_ORDER.getValue(), saOrderExt.getOrderType())
+        ) {
             firPurchaseOrderList.add(saOrderExt);
         } else if (Objects.equals(EOrderType.REPURCHASE_ORDER.getValue(), saOrderExt.getOrderType())
-                || Objects.equals(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue(), saOrderExt.getOrderType())) {
+//                || Objects.equals(EOrderType.SPECIAL_REPURCHASE_ORDER.getValue(), saOrderExt.getOrderType())
+        ) {
             repurchaseOrderList.add(saOrderExt);
         } else if (Objects.equals(EOrderType.SECOND_ORDER.getValue(), saOrderExt.getOrderType())) {
             repurchaseOrderList.add(saOrderExt);

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java

@@ -9,8 +9,6 @@ import java.util.List;
 
 /**
  * 订单类型枚举类
- *
- * @author hzs
  */
 @AllArgsConstructor
 @Getter
@@ -19,12 +17,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),
 
     /**
      * 复购订单
@@ -59,12 +57,12 @@ public enum EOrderType {
     /**
      * 乐学注册订单
      */
-    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),
 
     /**
      * 乐学甄选订单

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java

@@ -6,8 +6,6 @@ import lombok.Getter;
 
 /**
  * 所属专区枚举类
- *
- * @author hzs
  */
 @AllArgsConstructor
 @Getter
@@ -16,122 +14,53 @@ public enum ESpecialArea {
     /**
      * 注册专区
      */
-    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()),
 
     /**
      * 复购专区 名字修改为自营专区（复购自营）
      */
     REPURCHASE_AREA(3, "复购自营", 0, EnumsPrefixConstants.SPECIAL_AREA + "3", 5, EMenuDetail.REPURCHASE.getValue()),
 
-//    /**
-//     * 云代注册专区
-//     */
-//    CLOUD_REGISTER_AREA(4, "云代注册专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "4"),
-//
-//    /**
-//     * 云代升级专区
-//     */
-//    CLOUD_UPGRADE_AREA(5, "云代升级专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "5"),
-//
-//    /**
-//     * 云代复购专区
-//     */
-//    CLOUD_REPURCHASE_AREA(6, "云代复购专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "6"),
-//
-//    /**
-//     * 海粉专区
-//     */
-//    FANS_AREA(7, "海粉专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "7", 2, EMenuDetail.FANS.getValue()),
     /**
      * 提货专区
      */
     CARRY_GOODS_AREA(8, "提货专区", 1, EnumsPrefixConstants.SPECIAL_AREA + 8, 11, EMenuDetail.PICK.getValue()),
-//    /**
+
-//     * 礼包专区
-//     */
-//    GIFT_AREA(9, "礼包专区", 1, EnumsPrefixConstants.SPECIAL_AREA + 9, 12, -1),
     /**
      * 重消专区
      */
     RESCISSION_AREA(10, "重消专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "10", 8, EMenuDetail.REPEATED_CONSUMPTION.getValue()),
 
-//    /**
-//     * 积分专区
-//     */
-//    INTEGRAL_AREA(11, "积分专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "11", 13, EMenuDetail.INTEGRAL_AREA.getValue()),
-//
-//    /**
-//     * 云学院订单
-//     */
-//    CLOUD_COLLEGE_ORDER(12, "工具流", 0, EnumsPrefixConstants.SPECIAL_AREA + 12, 10, EMenuDetail.CLOUD.getValue()),
-
     /**
      * 福利专区
      */
     WELFARE_AREA(13, "福利专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 13, 9, EMenuDetail.WELFARE_AREA.getValue()),
 
-//    /**
-//     * 直播专区
-//     */
-//    LIVE_BROADCAST(14, "直播专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 14, 14, EMenuDetail.LIVE.getValue()),
-//
-//    /**
-//     * 创客礼包
-//     */
-//    MAKER_GIFT(18, "创客礼包", 0, EnumsPrefixConstants.SPECIAL_AREA + 18, 15, EMenuDetail.VIGOROUSLY_GIFT.getValue()),
-//
-//    /**
-//     * 赋能礼包
-//     */
-//    MAKER_GIFT_B(19, "赋能礼包", 0, EnumsPrefixConstants.SPECIAL_AREA + 19, 16, -1),
-//
-//    /**
-//     * 复购合作 团队带过来的产品
-//     */
-//    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, 6, EMenuDetail.REPURCHASE_LXYK.getValue()),
 
-//    /**
-//     * 海粉升级
-//     */
-//    HAI_FUN_UPGRADE_ORDER(27, "海粉升级", 0, EnumsPrefixConstants.ORDER_TYPE + 27, 20, EMenuDetail.UPGRADE_HAI_FUN.getValue()),
-//
-//    /**
-//     * 创客空间专区
-//     */
-//    MAKER_AREA(28, "创客空间专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 28, 28, EMenuDetail.MAKER_AREA.getValue()),
-//
-//    ENERGY_SILO(29, "能量仓赠品", 0, EnumsPrefixConstants.SPECIAL_AREA + 29, 29, EMenuDetail.ENERGY_SILO.getValue()),
-
     /**
      * 续约专区
      */
     RENEWAL_AREA(30, "续约专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 30, 30, EMenuDetail.RENEWAL_AREA.getValue()),
 
-//    /**
-//     * 专供专区
-//     */
-//    WHOLESALE_AREA(31, "专供专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 31, 31, EMenuDetail.WHOLESALE_AREA.getValue()),
-
     ;
 
     /**