Merge remote-tracking branch 'origin/dev' into dev

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java

@@ -55,10 +55,14 @@ public class DataStatisticsUtil {
         if(EYesNo.NO.getIntValue() == cuMember.getIsActivate()){
             // 昨日非激活 排除昨日日结表数据
             excludeDailySettlementData(detailVOList);
-        }else{
+        }
+        /**
+         * 2025年6月17日 团队盒数不包含注水,在此无需再次排除
+        else{
             // 排除注水数据
             excludeWaterInjectionData(detailVOList, pkId);
         }
+         */
         CuMemberRetailDataStatisticsDetailVO bigRangeBox = getBigRangeBoxDetailVO(detailVOList, pkId);
         CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId);
         Integer smallRangeTotalBoxNum = total.getTotalBoxNum() - bigRangeBox.getTotalBoxNum();
@@ -91,8 +95,8 @@ public class DataStatisticsUtil {
 //                     + detailVO.getTeamNewBoxNum()      // 团队新增盒数(日结)
                      + detailVO.getSNewBoxNum()         // 个人新增消费盒数(秒结)
                      + detailVO.getSTeamNewBoxNum()     // 团队新增盒数(秒结)
-//                     - detailVO.getBigBoxNum()          // 个人注水大区盒数(日结)
+                     + detailVO.getBigBoxNum()          // 个人注水大区盒数(日结)
-//                     - detailVO.getSmallBoxNum()        // 个人注水小区盒数(日结)
+                     + detailVO.getSmallBoxNum()        // 个人注水小区盒数(日结)
             );
             detailVO.setTotalPv(
                     detailVO.getConsumePv()