Compare commits
2 Commits
3e3fc163b8
...
b8952b949b
Author | SHA1 | Date |
---|---|---|
|
b8952b949b | |
|
b46cc1de12 |
|
@ -349,6 +349,13 @@ 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)
|
||||||
|
|
|
@ -54,10 +54,13 @@ public class DataStatisticsUtil {
|
||||||
// excludeDailySettlementData(detailVOList);
|
// excludeDailySettlementData(detailVOList);
|
||||||
// }
|
// }
|
||||||
CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId);
|
CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId);
|
||||||
BigDecimal smallRangeTotalPv = total.getTotalPv().subtract(bigRangePv.getTotalPv());
|
BigDecimal smallRangeTotalPv = BigDecimal.ZERO;
|
||||||
|
if(ObjectUtil.isNotEmpty(bigRangePv)){
|
||||||
|
smallRangeTotalPv = total.getTotalPv().subtract(bigRangePv.getTotalPv());
|
||||||
if (smallRangeTotalPv.compareTo(BigDecimal.ZERO) < 0) {
|
if (smallRangeTotalPv.compareTo(BigDecimal.ZERO) < 0) {
|
||||||
smallRangeTotalPv = BigDecimal.ZERO;
|
smallRangeTotalPv = BigDecimal.ZERO;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return CuMemberRetailDataStatisticsResultVO.builder()
|
return CuMemberRetailDataStatisticsResultVO.builder()
|
||||||
.totalPv(formatPV(total.getTotalPv()))
|
.totalPv(formatPV(total.getTotalPv()))
|
||||||
.bigRangeTotalPv(formatPV(bigRangePv.getTotalPv()))
|
.bigRangeTotalPv(formatPV(bigRangePv.getTotalPv()))
|
||||||
|
|
Loading…
Reference in New Issue