From 9824e05919062ecbed68cc1d26298485ac3144e3 Mon Sep 17 00:00:00 2001
From: wuweihua <88888888>
Date: Fri, 16 Oct 2026 14:05:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=84=E5=88=99=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PrcOrderBillServiceImpl.java | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java
index 33fcfcd5..b83ee9bf 100644
--- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java
+++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java
@@ -35,7 +35,7 @@ import com.bms.common.utils.uuid.IdUtils;
 import com.bms.customer.customerinfo.domain.BmsCustomer;
 import com.bms.customer.customerinfo.mapper.BmsCustomerMapper;
 import com.bms.system.mapper.SysUserMapper;
-// import com.bms.system.service.IBmsBizRuleService;
+import com.bms.system.service.IBmsBizRuleService;
 import com.bms.price.domain.PrcIncomeBill;
 import com.bms.price.domain.PrcIncomeBillFee;
 import com.bms.price.domain.PrcOrderBill;
@@ -143,9 +143,8 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
     @Autowired
     private PrcRecalcBillPriceAsyncRunner recalcBillPriceAsyncRunner;
 
-    // TODO: reopen with three-side / biz weight rules
-    // @Autowired
-    // private IBmsBizRuleService bizRuleService;
+    @Autowired
+    private IBmsBizRuleService bizRuleService;
 
     private static final int BATCH_ADD_FEE_MAX = 5000;
     private static final int BATCH_ADD_FEE_PREVIEW_LIMIT = 20;
@@ -172,16 +171,15 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
             PrcOrderBill existed = orderBillMapper.selectPrcOrderBillByOrderNo(request.getOrderNo());
             BigDecimal systemWeight = request.getWeight();
             BigDecimal calcWeight = resolveCalcWeight(existed, systemWeight);
-            // TODO: reopen three-side / biz weight rules later
             // Manual charge_weight wins; otherwise apply active biz rules (e.g. three-side).
-            // if (!isManualChargeWeight(existed))
-            // {
-            //     BigDecimal ruled = bizRuleService.resolveWeightByRule(request, systemWeight);
-            //     if (ruled != null)
-            //     {
-            //         calcWeight = ruled;
-            //     }
-            // }
+            if (!isManualChargeWeight(existed))
+            {
+                BigDecimal ruled = bizRuleService.resolveWeightByRule(request, systemWeight);
+                if (ruled != null)
+                {
+                    calcWeight = ruled;
+                }
+            }
             request.setWeight(calcWeight);
             TmsPriceQuoteResult result = tmsPriceQuoteService.calculate(request);
             persistBill(request, systemWeight, bizDate, result);