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