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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
cabbage 2025-10-13 10:49:55 +08:00
parent dad1169b81 eb781fbecc
commit d3da2a20c7
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File 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,6 +349,13 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
//查询直推会员
List<Long> pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType);
// pkMemberList.add(userId);
if(CollUtil.isEmpty(pkMemberList)){
return CuMemberRetailDataStatisticsResultVO.builder()
.totalPv(BigDecimal.ZERO)
.bigRangeTotalPv(BigDecimal.ZERO)
.smallRangeTotalPv(BigDecimal.ZERO)
.build();
}
CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder()
.memberRetailTable(memberRetailTable)
.memberRetailSTable(memberSecondTable)

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

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