From d847539bf45caf316eec644d585843f7ac5e1911 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Fri, 30 May 2025 09:55:44 +0800
Subject: [PATCH] =?UTF-8?q?##=202025.05.30=E8=A1=A5=E5=85=A8=E5=8C=97?=
 =?UTF-8?q?=E5=A4=A7=E5=88=B0=E4=B9=90=E5=AD=A6=E5=90=88=E5=B9=B6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/SaDeliverSecondController.java     |  4 ---
 .../hzs/common/core/enums/ESpecialArea.java   | 29 ++++---------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverSecondController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverSecondController.java
index 62082735..a4d68ccd 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverSecondController.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverSecondController.java
@@ -247,10 +247,6 @@ public class SaDeliverSecondController extends BaseController {
                 // 扣款比例不能大于 100%
                 return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.DEDUCT_RATIO_NOT_MORE_THAN) + "100%");
             }
-            if (deductRatio.compareTo(new BigDecimal("100")) < 0 && !zeroRatio) {
-                // 配置扣款比例不足 100%
-                return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.DEDUCT_RATIO_NOT_ENOUGH) + "100%");
-            }
         }
 
         String str = iSaDeliverBusinessService.secondDeliverSubmit(param, userTokenService.getLoginUser());
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 5fa8a09f..c17ccdcc 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
@@ -26,33 +26,11 @@ public enum ESpecialArea {
      */
     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),
+
     /**
      * 重消专区
      */
@@ -83,6 +61,11 @@ public enum ESpecialArea {
      */
     RENEWAL_AREA(30, "续约专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 30, 30, EMenuDetail.RENEWAL_AREA.getValue()),
 
+    /**
+     * 自助购票
+     */
+    RETAIL_TICKET(45, "自助购票", 0, EnumsPrefixConstants.SPECIAL_AREA + 45, 45, -1),
+
     ;
 
     /**