From 2ca069697ecf961420cc0533935264b60219602f Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Fri, 13 Jun 2025 15:25:51 +0800
Subject: [PATCH] =?UTF-8?q?##=20Fix=20-=20=E7=9B=92=E6=95=B0=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/utils/DataStatisticsUtil.java      | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 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 537017ac..f28e6207 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
@@ -55,7 +55,7 @@ public class DataStatisticsUtil {
             excludeDailySettlementData(detailVOList);
         }else{
             // 排除注水数据
-            excludeWaterInjectionData(detailVOList);
+            excludeWaterInjectionData(detailVOList, pkId);
         }
         Integer smallRangeTotalBoxNum = total.getTotalBoxNum() - bigRange.getTotalBoxNum();
         if(smallRangeTotalBoxNum < 0){
@@ -119,17 +119,21 @@ public class DataStatisticsUtil {
 
     /**
      * 排除昨日日结注水数据
+     * 自己的注水不排除
      * @param detailVOList
      */
-    public static void excludeWaterInjectionData(List<CuMemberRetailDataStatisticsDetailVO> detailVOList){
+    public static void excludeWaterInjectionData(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId){
         detailVOList.parallelStream().forEach(detailVO -> {
-            detailVO.setTotalBoxNum(
-                    detailVO.getTotalBoxNum()
-                            - detailVO.getBigBoxNum()               // 注水大区
-                            - detailVO.getSmallBoxNum()             // 注水小区
-            );
+            if(!detailVO.getPkId().equals(pkId)){
+                detailVO.setTotalBoxNum(
+                        detailVO.getTotalBoxNum()
+                                - detailVO.getBigBoxNum()               // 注水大区
+                                - detailVO.getSmallBoxNum()             // 注水小区
+                );
+            }
         });
     }
+
     /**
      * 增加虚拟分支 主要为
      * 1.自己的消费总数
@@ -154,7 +158,7 @@ public class DataStatisticsUtil {
                 CuMemberRetailDataStatisticsDetailVO smallRangeVirtualDetailVO = CuMemberRetailDataStatisticsDetailVO.builder()
                         .pkId(SMALL_RANGE_VIRTUAL_ID)
                         .memberCode(SMALL_RANGE_VIRTUAL_NAME)
-                        .totalBoxNum(detailVO.getBigBoxNum())
+                        .totalBoxNum(detailVO.getSmallBoxNum())
                         .totalPv(BigDecimal.ZERO)
                         .bigBoxNum(0)
                         .smallBoxNum(0)