From 8986823f58c3d54d2497f53bc83e824454faca10 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Sat, 14 Jun 2025 09:47:34 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E8=B0=83=E6=95=B4=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E6=B3=A8=E6=B0=B4=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hzs/retail/member/utils/DataStatisticsUtil.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
index 8539d1dd..fd56d08f 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
@@ -52,8 +52,6 @@ public class DataStatisticsUtil {
         calcDetailVOTotalField(detailVOList, pkId);
         addVirtualBranch(detailVOList, pkId);
         CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId);
-        CuMemberRetailDataStatisticsDetailVO bigRangeBox = getBigRangeBoxDetailVO(detailVOList, pkId);
-        CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId);
         if(EYesNo.NO.getIntValue() == cuMember.getIsActivate()){
             // 昨日非激活 排除昨日日结表数据
             excludeDailySettlementData(detailVOList);
@@ -61,6 +59,8 @@ public class DataStatisticsUtil {
             // 排除注水数据
             excludeWaterInjectionData(detailVOList, pkId);
         }
+        CuMemberRetailDataStatisticsDetailVO bigRangeBox = getBigRangeBoxDetailVO(detailVOList, pkId);
+        CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId);
         Integer smallRangeTotalBoxNum = total.getTotalBoxNum() - bigRangeBox.getTotalBoxNum();
         if(smallRangeTotalBoxNum < 0){
             smallRangeTotalBoxNum = 0;