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 07965a94..2878886b 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 @@ -46,10 +46,10 @@ public class DataStatisticsUtil { calcDetailVOTotalField(detailVOList, pkId); // addVirtualBranch(detailVOList, pkId); CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId); - if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) { - // 昨日非激活 排除昨日日结表数据 - excludeDailySettlementData(detailVOList); - } +// if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) { +// // 昨日非激活 排除昨日日结表数据 +// excludeDailySettlementData(detailVOList); +// } CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId); BigDecimal smallRangeTotalPv = total.getTotalPv().subtract(bigRangePv.getTotalPv()); if (smallRangeTotalPv.compareTo(BigDecimal.ZERO) < 0) { diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml index 36e6684e..b1c05d45 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml @@ -447,6 +447,31 @@