diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/controller/BoardController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/controller/BoardController.java index 33b07131..91c597f4 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/controller/BoardController.java +++ b/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 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); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/mapper/BoardMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/mapper/BoardMapper.java index f78ebaed..fbeee6c9 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/mapper/BoardMapper.java +++ b/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 listMemberLevelBoard(); + /** * 查询日业绩汇总数据 * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/service/IBoardService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/service/IBoardService.java index fa0b11ee..73afa57f 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/service/IBoardService.java +++ b/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 listMemberLevelBoard(); + /** * 查询日业绩汇总数据 * diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/service/impl/BoardServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/service/impl/BoardServiceImpl.java index fadfb789..1f827ab4 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/service/impl/BoardServiceImpl.java +++ b/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 listMemberLevelBoard() { + return boardMapper.listMemberLevelBoard(); + } + @Override public List getDayAchieve() { return boardMapper.getDayAchieve(); diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardMemberLevelVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardMemberLevelVO.java new file mode 100644 index 00000000..8c8abe7d --- /dev/null +++ b/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; + +} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardMemberVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardMemberVO.java index 8dfba028..d88c4395 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardMemberVO.java +++ b/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 memberTodayLevelList; /** * 昨日新増会员 */ private Integer memberYesterday; + /** + * 今日会员等级 + */ + private List memberYesterdayLevelList; /** * 本月新増会员 */ private Integer memberMonth; + /** + * 本月会员等级 + */ + private List memberMonthLevelList; } diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml index 43bd9ecf..25f74204 100644 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml +++ b/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 + + +