From c278ed76f7fd796d26d36efd7f62fd19704aea3c Mon Sep 17 00:00:00 2001
From: wuweihua <88888888>
Date: Mon, 28 Sep 2026 16:38:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=B7=E6=A0=BC=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/i18n/messages.properties   |  1 -
 .../service/impl/PrcPriceSetServiceImpl.java  | 31 ++++++++-----------
 .../set/components/create/PriceEditDrawer.vue | 20 ++++++------
 3 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/bms-back/bms-admin/src/main/resources/i18n/messages.properties b/bms-back/bms-admin/src/main/resources/i18n/messages.properties
index 0b3e3693..c7f38421 100644
--- a/bms-back/bms-admin/src/main/resources/i18n/messages.properties
+++ b/bms-back/bms-admin/src/main/resources/i18n/messages.properties
@@ -75,7 +75,6 @@ price.set.detail.registration.empty=固定价明细必须填写挂号费
 price.set.detail.zone.empty=固定价明细必须选择分区
 price.set.detail.roundMode.invalid=取值方式仅支持 UP / DOWN / HALF_UP
 price.set.detail.freight.belowBase=套餐运费不能低于导入基准价 {0}
-price.set.detail.registration.belowBase=套餐挂号费不能低于导入基准价 {0}
 price.set.customer.notExists=客户绑定不存在
 price.set.customer.unbindAudit=审核中的套餐不允许解绑客户
 price.set.customer.customerId.empty=客户ID不能为空
diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPriceSetServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPriceSetServiceImpl.java
index f181fa0a..cc8198f0 100644
--- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPriceSetServiceImpl.java
+++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPriceSetServiceImpl.java
@@ -1093,26 +1093,21 @@ public class PrcPriceSetServiceImpl implements IPrcPriceSetService
         }
     }
 
-    /** Package freight / registration must not go below the imported product country price. */
+    /** Package freight floor vs imported base — temporarily disabled. */
     private void assertNotBelowImportedPrice(PrcPriceSetDetail detail)
     {
-        BmsProductCountry base = findImportedPrice(detail);
-        if (base == null)
-        {
-            return;
-        }
-        if (detail.getFvValue() != null && base.getFreightPrice() != null
-            && detail.getFvValue().compareTo(base.getFreightPrice()) < 0)
-        {
-            throw new ServiceException(MessageUtils.message("price.set.detail.freight.belowBase",
-                stripTrailingZeros(base.getFreightPrice())));
-        }
-        if (detail.getFvRegistrationFee() != null && base.getRegistrationFee() != null
-            && detail.getFvRegistrationFee().compareTo(base.getRegistrationFee()) < 0)
-        {
-            throw new ServiceException(MessageUtils.message("price.set.detail.registration.belowBase",
-                stripTrailingZeros(base.getRegistrationFee())));
-        }
+        // Temporarily allow package freight below imported base price.
+        // BmsProductCountry base = findImportedPrice(detail);
+        // if (base == null)
+        // {
+        //     return;
+        // }
+        // if (detail.getFvValue() != null && base.getFreightPrice() != null
+        //     && detail.getFvValue().compareTo(base.getFreightPrice()) < 0)
+        // {
+        //     throw new ServiceException(MessageUtils.message("price.set.detail.freight.belowBase",
+        //         stripTrailingZeros(base.getFreightPrice())));
+        // }
     }
 
     private BmsProductCountry findImportedPrice(PrcPriceSetDetail detail)
diff --git a/bms-front/src/views/price/set/components/create/PriceEditDrawer.vue b/bms-front/src/views/price/set/components/create/PriceEditDrawer.vue
index 9d6e13f6..6d4d438a 100644
--- a/bms-front/src/views/price/set/components/create/PriceEditDrawer.vue
+++ b/bms-front/src/views/price/set/components/create/PriceEditDrawer.vue
@@ -111,7 +111,7 @@ const title = computed(() => {
   const name = props.productName || ''
   return code + ' · ' + name + ' · 国家服务价格'
 })
-const hint = '黄色行=已改价；点编辑图标后修改，失焦即刻写入数据库。单位：运费 RMB/KG，挂号费 RMB/票。不能低于导入基准价。'
+const hint = '黄色行=已改价；点编辑图标后修改，失焦即刻写入数据库。单位：运费 RMB/KG，挂号费 RMB/票。'
 const phSearch = '搜索国家/分区'
 const colCountry = '国家'
 const colZone = '分区'
@@ -168,14 +168,16 @@ async function commitEdit(row, field) {
   editingKey.value = ''
   try {
     if (!row) return
-    const floor = field === 'fv' ? row._floorFreight : row._floorReg
-    const value = field === 'fv' ? row.fvValue : row.fvRegistrationFee
-    if (isBelowFloor(value, floor)) {
-      if (field === 'fv') row.fvValue = row._editPrevFv
-      else row.fvRegistrationFee = row._editPrevReg
-      proxy.$modal.msgError(belowFloorMessage(field, floor))
-      return
-    }
+    // Temporarily allow freight / registration below imported base price.
+    // if (field === 'fv') {
+    //   const floor = row._floorFreight
+    //   const value = row.fvValue
+    //   if (isBelowFloor(value, floor)) {
+    //     row.fvValue = row._editPrevFv
+    //     proxy.$modal.msgError(belowFloorMessage(field, floor))
+    //     return
+    //   }
+    // }
     if (!row.psdId) return
     emit('row-change', row)
   } finally {