## 后台首页看板返回各等级人数；

bd-business/bd-business-system/src/main/java/com/hzs/system/board/controller/BoardController.java

@@ -7,12 +7,14 @@ import com.hzs.common.core.web.domain.AjaxResult;
 import com.hzs.system.board.service.IBoardService;
 import com.hzs.system.board.vo.BoardAchieveVO;
 import com.hzs.system.board.vo.BoardDayAchieveVO;
+import com.hzs.system.board.vo.BoardMemberLevelVO;
 import com.hzs.system.board.vo.BoardMemberVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -32,7 +34,27 @@ public class BoardController extends BaseController {
      */
     @GetMapping("/member-summary")
     public AjaxResult memberSummary() {
+        // 会员汇总数据
         BoardMemberVO boardMemberVO = iBoardService.getMemberBoard();
+        boardMemberVO.setMemberTodayLevelList(new ArrayList<>(6));
+        boardMemberVO.setMemberYesterdayLevelList(new ArrayList<>(6));
+        boardMemberVO.setMemberMonthLevelList(new ArrayList<>(6));
+
+        // 会员各等级数据
+        List<BoardMemberLevelVO> levelList = iBoardService.listMemberLevelBoard();
+
+        for (BoardMemberLevelVO boardMemberLevelVO : levelList) {
+            if (boardMemberLevelVO.getSort() == 0) {
+                // 今日
+                boardMemberVO.getMemberTodayLevelList().add(boardMemberLevelVO);
+            } else if (boardMemberLevelVO.getSort() == 1) {
+                // 昨日
+                boardMemberVO.getMemberYesterdayLevelList().add(boardMemberLevelVO);
+            } else {
+                // 本月
+                boardMemberVO.getMemberMonthLevelList().add(boardMemberLevelVO);
+            }
+        }
         return AjaxResult.success(boardMemberVO);
     }
 

bd-business/bd-business-system/src/main/java/com/hzs/system/board/mapper/BoardMapper.java

@@ -1,6 +1,7 @@
 package com.hzs.system.board.mapper;
 
 import com.hzs.system.board.vo.BoardAchieveVO;
+import com.hzs.system.board.vo.BoardMemberLevelVO;
 import com.hzs.system.board.vo.BoardMemberVO;
 
 import java.util.List;
@@ -17,6 +18,13 @@ public interface BoardMapper {
      */
     BoardMemberVO getMemberBoard();
 
+    /**
+     * 查询会员等级数据
+     *
+     * @return
+     */
+    List<BoardMemberLevelVO> listMemberLevelBoard();
+
     /**
      * 查询日业绩汇总数据
      *

bd-business/bd-business-system/src/main/java/com/hzs/system/board/service/IBoardService.java

@@ -1,6 +1,7 @@
 package com.hzs.system.board.service;
 
 import com.hzs.system.board.vo.BoardAchieveVO;
+import com.hzs.system.board.vo.BoardMemberLevelVO;
 import com.hzs.system.board.vo.BoardMemberVO;
 
 import java.util.List;
@@ -17,6 +18,13 @@ public interface IBoardService {
      */
     BoardMemberVO getMemberBoard();
 
+    /**
+     * 查询会员等级数据
+     *
+     * @return
+     */
+    List<BoardMemberLevelVO> listMemberLevelBoard();
+
     /**
      * 查询日业绩汇总数据
      *

bd-business/bd-business-system/src/main/java/com/hzs/system/board/service/impl/BoardServiceImpl.java

@@ -3,6 +3,7 @@ package com.hzs.system.board.service.impl;
 import com.hzs.system.board.mapper.BoardMapper;
 import com.hzs.system.board.service.IBoardService;
 import com.hzs.system.board.vo.BoardAchieveVO;
+import com.hzs.system.board.vo.BoardMemberLevelVO;
 import com.hzs.system.board.vo.BoardMemberVO;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +24,11 @@ public class BoardServiceImpl implements IBoardService {
         return boardMapper.getMemberBoard();
     }
 
+    @Override
+    public List<BoardMemberLevelVO> listMemberLevelBoard() {
+        return boardMapper.listMemberLevelBoard();
+    }
+
     @Override
     public List<BoardAchieveVO> getDayAchieve() {
         return boardMapper.getDayAchieve();

bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardMemberLevelVO.java

@@ -0,0 +1,25 @@
+package com.hzs.system.board.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class BoardMemberLevelVO implements Serializable {
+
+    /**
+     * 等级名称
+     */
+    private String gradeName;
+
+    /**
+     * 会员数量
+     */
+    private Integer memberTotal;
+
+    /**
+     * 0=今日，1=昨日，2=当月
+     */
+    private Integer sort;
+
+}

bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardMemberVO.java

@@ -1,8 +1,8 @@
 package com.hzs.system.board.vo;
 
-import com.hzs.common.core.annotation.BigDecimalFormat;
 import lombok.Data;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 看板会员汇总数据
@@ -19,15 +19,27 @@ public class BoardMemberVO implements Serializable {
      * 今日新増会员
      */
     private Integer memberToday;
+    /**
+     * 今日会员等级
+     */
+    private List<BoardMemberLevelVO> memberTodayLevelList;
 
     /**
      * 昨日新増会员
      */
     private Integer memberYesterday;
+    /**
+     * 今日会员等级
+     */
+    private List<BoardMemberLevelVO> memberYesterdayLevelList;
 
     /**
      * 本月新増会员
      */
     private Integer memberMonth;
+    /**
+     * 本月会员等级
+     */
+    private List<BoardMemberLevelVO> memberMonthLevelList;
 
 }

bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml

@@ -36,6 +36,60 @@
                                   to_char(sysdate, 'yyyy-mm')) d on 1 = 1
     </select>
 
+    <!-- 会员各等级数据 -->
+    <select id="listMemberLevelBoard" resultType="com.hzs.system.board.vo.BoardMemberLevelVO">
+        select bg.grade_name,
+               bg.grade_value,
+               nvl(a.member_total, 0) member_total,
+               0 sort
+        from (select cm.pk_settle_grade, count(1) member_total
+              from cu_member cm
+              where cm.del_flag = 0
+                and cm.pay_status = 1
+                and cm.category = 0
+                and to_char(cm.pay_time, 'yyyy-mm-dd') =
+                    to_char(sysdate, 'yyyy-mm-dd')
+              group by cm.pk_settle_grade
+              order by cm.pk_settle_grade) a
+                 right join bd_grade bg
+                            on bg.pk_id = a.pk_settle_grade
+        where bg.del_flag = 0
+        union all
+        select bg.grade_name,
+               bg.grade_value,
+               nvl(a.member_total, 0) member_total,
+               1 sort
+        from (select cm.pk_settle_grade, count(1) member_total
+              from cu_member cm
+              where cm.del_flag = 0
+                and cm.pay_status = 1
+                and cm.category = 0
+                and to_char(cm.pay_time, 'yyyy-mm-dd') =
+                    to_char(sysdate - 1, 'yyyy-mm-dd')
+              group by cm.pk_settle_grade
+              order by cm.pk_settle_grade) a
+                 right join bd_grade bg
+                            on bg.pk_id = a.pk_settle_grade
+        where bg.del_flag = 0
+        union all
+        select bg.grade_name,
+               bg.grade_value,
+               nvl(a.member_total, 0) member_total,
+               2 sort
+        from (select cm.pk_settle_grade, count(1) member_total
+              from cu_member cm
+              where cm.del_flag = 0
+                and cm.pay_status = 1
+                and cm.category = 0
+                and to_char(cm.pay_time, 'yyyy-mm') = to_char(sysdate, 'yyyy-mm')
+              group by cm.pk_settle_grade
+              order by cm.pk_settle_grade) a
+                 right join bd_grade bg
+                            on bg.pk_id = a.pk_settle_grade
+        where bg.del_flag = 0
+        order by sort, grade_value
+    </select>
+
     <!-- 查询日业绩汇总数据 -->
     <select id="getDayAchieve" resultType="com.hzs.system.board.vo.BoardAchieveVO">
         select a.*, b.*, 0 sort