angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

## Fix - teambox调整为不包含注水,计算大小区需要加上两个注水属性,计算总数时无需再排除注水

This commit is contained in:
sangelxiu1 2025-06-17 11:08:06 +08:00 committed by cabbage
parent 394b6dad10
commit 9d8d22ce1a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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