## Opt - 市场动态-取消自己虚拟区&取消计算个人业绩
This commit is contained in:
parent
e5c1287d22
commit
6442f2bbfb
|
@ -44,7 +44,7 @@ public class DataStatisticsUtil {
|
|||
.build();
|
||||
}
|
||||
calcDetailVOTotalField(detailVOList, pkId);
|
||||
addVirtualBranch(detailVOList, pkId);
|
||||
// addVirtualBranch(detailVOList, pkId);
|
||||
CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId);
|
||||
if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
|
||||
// 昨日非激活 排除昨日日结表数据
|
||||
|
@ -69,9 +69,14 @@ public class DataStatisticsUtil {
|
|||
*/
|
||||
public static void calcDetailVOTotalField(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId) {
|
||||
detailVOList.forEach(detailVO -> {
|
||||
// detailVO.setTotalPv(
|
||||
// detailVO.getConsumePv()
|
||||
// .add(detailVO.getTeamConsumePv())
|
||||
// .add(detailVO.getSNewConsumePv())
|
||||
// .add(detailVO.getSTeamNewPv())
|
||||
// );
|
||||
detailVO.setTotalPv(
|
||||
detailVO.getConsumePv()
|
||||
.add(detailVO.getTeamConsumePv())
|
||||
detailVO.getTeamConsumePv()
|
||||
.add(detailVO.getSNewConsumePv())
|
||||
.add(detailVO.getSTeamNewPv())
|
||||
);
|
||||
|
@ -155,7 +160,7 @@ public class DataStatisticsUtil {
|
|||
|
||||
private static CuMemberRetailDataStatisticsDetailVO getBigRangePVDetailVO(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId) {
|
||||
return detailVOList.stream()
|
||||
.filter(vo -> !vo.getPkId().equals(pkId))
|
||||
// .filter(vo -> !vo.getPkId().equals(pkId))
|
||||
.max(Comparator.comparing(CuMemberRetailDataStatisticsDetailVO::getTotalPv))
|
||||
.orElse(null);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue