From 4ca5a57e6acde375ff52ea8da7f334d541403916 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Fri, 4 Sep 2026 10:13:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../baiyue/firstleg/service/InboundMeasurementService.java    | 3 +--
 .../com/baiyue/firstleg/service/MeasurementBatchService.java  | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/InboundMeasurementService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/InboundMeasurementService.java
index 4b08e8a64..6798fe9fa 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/InboundMeasurementService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/InboundMeasurementService.java
@@ -108,8 +108,7 @@ public class InboundMeasurementService {
         request.items().stream().map(InboundMeasurementRequests.ItemRequest::chargeRuleId)
             .filter(java.util.Objects::nonNull).distinct().forEach(ruleId -> {
                 var rule = fbaMasterDataService.rule(tenantId, ruleId);
-                long inboundCustomerId = inbound.getCustomerId() == null ? tenantId : inbound.getCustomerId();
-                if (!"ACTIVE".equals(rule.getStatus()) || !java.util.Objects.equals(rule.getCustomerId(), inboundCustomerId)) {
+                if (!"ACTIVE".equals(rule.getStatus()) || !java.util.Objects.equals(rule.getTenantId(), tenantId)) {
                     throw new BizException(ResultCode.VALIDATION_FAILED, "测量明细绑定的计费规则不属于当前客户或已停用");
                 }
             });
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/MeasurementBatchService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/MeasurementBatchService.java
index 5cc581196..8839170c7 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/MeasurementBatchService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/MeasurementBatchService.java
@@ -263,12 +263,12 @@ public class MeasurementBatchService {
     }
 
     private CustomerChargeRuleEntity requireCoefficientRule(long tenantId, Long customerId, Long ruleId) {
-        Long effectiveCustomerId = customerId == null || customerId <= 0 ? tenantId : customerId;
+        Long effectiveCustomerId = tenantId;
         CustomerChargeRuleEntity rule = ruleId == null
             ? pricingRepository.findDefaultRule(tenantId, effectiveCustomerId)
             : pricingRepository.findRule(tenantId, ruleId);
         if (rule == null || !"ACTIVE".equals(rule.getStatus())
-            || !effectiveCustomerId.equals(rule.getCustomerId())) {
+            || !java.util.Objects.equals(rule.getTenantId(), tenantId)) {
             throw new BizException(ResultCode.VALIDATION_FAILED, "计费规则不属于当前客户或已停用");
         }
         return rule;