|
|
|
@@ -116,26 +116,26 @@ public class WxUserStructureController extends BaseController { |
|
|
|
dto.setTenantId(getTenantId()); |
|
|
|
dto.setStartTime(startTime); |
|
|
|
dto.setEndTime(endTime); |
|
|
|
if (i == 0) { |
|
|
|
dto.setLevelEndScore(levelList.get(i).getPoints()); |
|
|
|
} else if (i == levelList.size()-1) { |
|
|
|
dto.setLevelStartScore(levelList.get(i).getPoints()); |
|
|
|
} else{ |
|
|
|
if (i + 1 < levelList.size()) { |
|
|
|
dto.setLevelStartScore(levelList.get(i).getPoints()); |
|
|
|
dto.setLevelEndScore(levelList.get(i+1).getPoints()); |
|
|
|
}else{ |
|
|
|
dto.setLevelStartScore(levelList.get(i).getPoints()); |
|
|
|
} |
|
|
|
|
|
|
|
long all = wxCUserBasicInfoService.findCountByScore(dto); |
|
|
|
|
|
|
|
//null积分算最低级会员 |
|
|
|
if (i == 0){ |
|
|
|
dto.setLevelStartScore(null); |
|
|
|
dto.setLevelEndScore(null); |
|
|
|
all += wxCUserBasicInfoService.findCountByScore(dto); |
|
|
|
} |
|
|
|
|
|
|
|
levelList.get(i).setCount(all); |
|
|
|
} |
|
|
|
|
|
|
|
WxLevelConfig other = new WxLevelConfig(); |
|
|
|
//没有等级的会员 |
|
|
|
other.setLevel("无"); |
|
|
|
WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); |
|
|
|
other.setCount(wxCUserBasicInfoService.findCount(dto) |
|
|
|
-levelList.stream().map(WxLevelConfig::getCount).reduce(Long::sum).get()); |
|
|
|
|
|
|
|
levelList.add(other); |
|
|
|
return new ResultData(levelList); |
|
|
|
} |
|
|
|
|
|
|
|
|