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

## Opt - 市场动态-取消自己虚拟区&取消计算个人业绩

This commit is contained in:
sangelxiu1 2025-09-28 13:40:07 +08:00
parent e5c1287d22
commit 6442f2bbfb
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ public class DataStatisticsUtil {
.build(); .build();
} }
calcDetailVOTotalField(detailVOList, pkId); calcDetailVOTotalField(detailVOList, pkId);
addVirtualBranch(detailVOList, pkId); // addVirtualBranch(detailVOList, pkId);
CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId); CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId);
if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) { if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
// 昨日非激活 排除昨日日结表数据 // 昨日非激活 排除昨日日结表数据
@ -69,9 +69,14 @@ public class DataStatisticsUtil {
*/ */
public static void calcDetailVOTotalField(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId) { public static void calcDetailVOTotalField(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId) {
detailVOList.forEach(detailVO -> { detailVOList.forEach(detailVO -> {
// detailVO.setTotalPv(
// detailVO.getConsumePv()
// .add(detailVO.getTeamConsumePv())
// .add(detailVO.getSNewConsumePv())
// .add(detailVO.getSTeamNewPv())
// );
detailVO.setTotalPv( detailVO.setTotalPv(
detailVO.getConsumePv() detailVO.getTeamConsumePv()
.add(detailVO.getTeamConsumePv())
.add(detailVO.getSNewConsumePv()) .add(detailVO.getSNewConsumePv())
.add(detailVO.getSTeamNewPv()) .add(detailVO.getSTeamNewPv())
); );
@ -155,7 +160,7 @@ public class DataStatisticsUtil {
private static CuMemberRetailDataStatisticsDetailVO getBigRangePVDetailVO(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId) { private static CuMemberRetailDataStatisticsDetailVO getBigRangePVDetailVO(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId) {
return detailVOList.stream() return detailVOList.stream()
.filter(vo -> !vo.getPkId().equals(pkId)) // .filter(vo -> !vo.getPkId().equals(pkId))
.max(Comparator.comparing(CuMemberRetailDataStatisticsDetailVO::getTotalPv)) .max(Comparator.comparing(CuMemberRetailDataStatisticsDetailVO::getTotalPv))
.orElse(null); .orElse(null);
} }