angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:9cd5b3b742ce870a47179e4503bb728d3db11011
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
..
compare: angelo:54ef511bdc53f5a3e07ece8552ccccc72e4ccc06
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:master

No commits in common. "9cd5b3b742ce870a47179e4503bb728d3db11011" and "54ef511bdc53f5a3e07ece8552ccccc72e4ccc06" have entirely different histories.
9cd5b3b742 ... 54ef511bdc

2 changed files with 9 additions and 12 deletions
Show Stats Expand all files Collapse all files

2
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
View File

@ -348,7 +348,7 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
String memberSecondTable = getDayTableNameSpecial();
//查询直推会员
List<Long> pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType);
// pkMemberList.add(userId);
pkMemberList.add(userId);
CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder()
.memberRetailTable(memberRetailTable)
.memberRetailSTable(memberSecondTable)

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

@ -36,19 +36,16 @@ public class DataStatisticsUtil {
Long pkId = cuMember.getPkId();
// 非激活直接返0
// 激活判断上一天的ENABLE_STATUS 0为正常 1为当天激活 不计算日结数据
// if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
// return CuMemberRetailDataStatisticsResultVO.builder()
// .totalPv(BigDecimal.ZERO)
// .bigRangeTotalPv(BigDecimal.ZERO)
// .smallRangeTotalPv(BigDecimal.ZERO)
// .build();
// }
if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
return CuMemberRetailDataStatisticsResultVO.builder()
.totalPv(BigDecimal.ZERO)
.bigRangeTotalPv(BigDecimal.ZERO)
.smallRangeTotalPv(BigDecimal.ZERO)
.build();
}
calcDetailVOTotalField(detailVOList, pkId);
// addVirtualBranch(detailVOList, pkId);
// CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId);
CuMemberRetailDataStatisticsDetailVO total = CuMemberRetailDataStatisticsDetailVO.builder()
.totalPv(detailVOList.stream().map(CuMemberRetailDataStatisticsDetailVO::getConsumePv).reduce(BigDecimal.ZERO, BigDecimal::add))
.build();
CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId);
// if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
// // 昨日非激活 排除昨日日结表数据
// excludeDailySettlementData(detailVOList);