From 9d8d22ce1a5fa9ed8b08c64b71f15f40bfb80c35 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Tue, 17 Jun 2025 11:08:06 +0800 Subject: [PATCH] =?UTF-8?q?##=20Fix=20-=20teambox=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=BA=E4=B8=8D=E5=8C=85=E5=90=AB=E6=B3=A8=E6=B0=B4,?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=A4=A7=E5=B0=8F=E5=8C=BA=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E4=B8=A4=E4=B8=AA=E6=B3=A8=E6=B0=B4=E5=B1=9E?= =?UTF-8?q?=E6=80=A7,=E8=AE=A1=E7=AE=97=E6=80=BB=E6=95=B0=E6=97=B6?= =?UTF-8?q?=E6=97=A0=E9=9C=80=E5=86=8D=E6=8E=92=E9=99=A4=E6=B3=A8=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/retail/member/utils/DataStatisticsUtil.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 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 d5836207..ebd51c54 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,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.getSmallBoxNum() // 个人注水小区盒数(日结) + + detailVO.getBigBoxNum() // 个人注水大区盒数(日结) + + detailVO.getSmallBoxNum() // 个人注水小区盒数(日结) ); detailVO.setTotalPv( detailVO.getConsumePv()