From a5971b9d587e5ffd11df018c2cf9ce5ef3644225 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 25 Jan 2019 13:07:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=9A=E5=91=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=BB=93=E6=9E=84=E4=B8=AD=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E7=BB=93=E6=9E=84=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxUserStructureController.java | 24 +++++++++---------- .../mapper/WxCUserBasicInfoMapper.xml | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java index 5b15abd0e..6e0e6ceda 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java @@ -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); } diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 7f9bd8415..44d09b1e0 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -168,7 +168,7 @@ - and poins <= #{levelEndScore} + and poins < #{levelEndScore}