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

Compare commits

base: angelo:b8952b949b950b3662efbb33572a8127ce32e776
Branches Tags
angelo:master
angelo:dev
angelo:test
angelo:online
..
compare: angelo:3e3fc163b8b2d6a0296da65b605c0b430783b729
Branches Tags
angelo:dev
angelo:test
angelo:online
angelo:master

No commits in common. "b8952b949b950b3662efbb33572a8127ce32e776" and "3e3fc163b8b2d6a0296da65b605c0b430783b729" have entirely different histories.
b8952b949b ... 3e3fc163b8

2 changed files with 3 additions and 13 deletions
Show Stats Expand all files Collapse all files

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

@ -349,13 +349,6 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
//查询直推会员 //查询直推会员
List<Long> pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType); List<Long> pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType);
// pkMemberList.add(userId); // pkMemberList.add(userId);
if(CollUtil.isEmpty(pkMemberList)){
return CuMemberRetailDataStatisticsResultVO.builder()
.totalPv(BigDecimal.ZERO)
.bigRangeTotalPv(BigDecimal.ZERO)
.smallRangeTotalPv(BigDecimal.ZERO)
.build();
}
CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder() CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder()
.memberRetailTable(memberRetailTable) .memberRetailTable(memberRetailTable)
.memberRetailSTable(memberSecondTable) .memberRetailSTable(memberSecondTable)

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

@ -54,12 +54,9 @@ public class DataStatisticsUtil {
// excludeDailySettlementData(detailVOList); // excludeDailySettlementData(detailVOList);
// } // }
CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId); CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId);
BigDecimal smallRangeTotalPv = BigDecimal.ZERO; BigDecimal smallRangeTotalPv = total.getTotalPv().subtract(bigRangePv.getTotalPv());
if(ObjectUtil.isNotEmpty(bigRangePv)){ if (smallRangeTotalPv.compareTo(BigDecimal.ZERO) < 0) {
smallRangeTotalPv = total.getTotalPv().subtract(bigRangePv.getTotalPv()); smallRangeTotalPv = BigDecimal.ZERO;
if (smallRangeTotalPv.compareTo(BigDecimal.ZERO) < 0) {
smallRangeTotalPv = BigDecimal.ZERO;
}
} }
return CuMemberRetailDataStatisticsResultVO.builder() return CuMemberRetailDataStatisticsResultVO.builder()
.totalPv(formatPV(total.getTotalPv())) .totalPv(formatPV(total.getTotalPv()))