Compare commits
	
		
			No commits in common. "0ef00695f8958f0d0645ff80ccebb46e38ffa90d" and "8eb6ee85867b98fcd93e6abb159ada80fde27cb0" have entirely different histories.
		
	
	
		
			0ef00695f8
			...
			8eb6ee8586
		
	
		| 
						 | 
					@ -270,11 +270,6 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
 | 
				
			||||||
        if(ObjectUtil.isEmpty(memberAchieveList)){
 | 
					        if(ObjectUtil.isEmpty(memberAchieveList)){
 | 
				
			||||||
            return null;
 | 
					            return null;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        for (CuMemberRetailAchieveVO cuMemberRetailAchieveVO : memberAchieveList) {
 | 
					 | 
				
			||||||
            if(ObjectUtil.isEmpty(cuMemberRetailAchieveVO.getArealPv())){
 | 
					 | 
				
			||||||
                cuMemberRetailAchieveVO.setArealPv(BigDecimal.ZERO);
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
        CuMemberRetailAchieveVO maxAchieveVO = memberAchieveList.stream().max(Comparator.comparing(CuMemberRetailAchieveVO::getArealPv)).get();
 | 
					        CuMemberRetailAchieveVO maxAchieveVO = memberAchieveList.stream().max(Comparator.comparing(CuMemberRetailAchieveVO::getArealPv)).get();
 | 
				
			||||||
        //查询小区业绩
 | 
					        //查询小区业绩
 | 
				
			||||||
        BigDecimal smallAreaPv = memberAchieveList.stream().filter(achieveVO -> !achieveVO.getPkMember().equals(maxAchieveVO.getPkMember())).map(vo -> null == vo.getArealPv() ? BigDecimal.ZERO : vo.getArealPv()).reduce(BigDecimal.ZERO, BigDecimal::add);
 | 
					        BigDecimal smallAreaPv = memberAchieveList.stream().filter(achieveVO -> !achieveVO.getPkMember().equals(maxAchieveVO.getPkMember())).map(vo -> null == vo.getArealPv() ? BigDecimal.ZERO : vo.getArealPv()).reduce(BigDecimal.ZERO, BigDecimal::add);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue