From 35723dbd96ff1c6c3596a7fec1248b1b4ef2977d Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 13 May 2025 18:06:45 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E7=9C=8B=E6=9D=BF=E5=85=85=E5=80=BC?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../board/controller/BoardController.java | 35 ++++++++-- .../hzs/system/board/mapper/BoardMapper.java | 8 +++ .../system/board/service/IBoardService.java | 8 +++ .../board/service/impl/BoardServiceImpl.java | 6 ++ .../system/board/vo/BoardMemberLevelVO.java | 3 + .../hzs/system/board/vo/BoardMemberVO.java | 2 +- .../board/vo/BoardRechargeAccountVO.java | 28 ++++++++ .../hzs/system/board/vo/BoardRechargeVO.java | 30 ++++++++ .../mapper/system/board/BoardMapper.xml | 69 +++++++++++++++++++ 9 files changed, 184 insertions(+), 5 deletions(-) create mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardRechargeAccountVO.java create mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardRechargeVO.java 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 91c597f4..8a658ada 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 @@ -5,10 +5,7 @@ import com.hzs.common.core.utils.BigDecimalUtil; import com.hzs.common.core.web.controller.BaseController; 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 com.hzs.system.board.vo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -107,4 +104,34 @@ public class BoardController extends BaseController { return AjaxResult.success(boardAchieveVO); } + /** + * 充值汇总数据 + * + * @return + */ + @GetMapping("/recharge-summary") + public AjaxResult rechargeSummary() { + BoardRechargeVO boardRechargeVO = new BoardRechargeVO(); + boardRechargeVO.setRechargeTodayList(new ArrayList<>(6)); + boardRechargeVO.setRechargeYesterdayLevelList(new ArrayList<>(6)); + boardRechargeVO.setRechargeMonthLevelList(new ArrayList<>(6)); + + // 会员汇总数据 + List rechargeList = iBoardService.listAccountRechargeBoard(); + + for (BoardRechargeAccountVO boardMemberVO : rechargeList) { + if (boardMemberVO.getSort() == 0) { + // 今日 + boardRechargeVO.getRechargeTodayList().add(boardMemberVO); + } else if (boardMemberVO.getSort() == 1) { + // 昨日 + boardRechargeVO.getRechargeYesterdayLevelList().add(boardMemberVO); + } else { + // 本月 + boardRechargeVO.getRechargeMonthLevelList().add(boardMemberVO); + } + } + return AjaxResult.success(boardRechargeVO); + } + } 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 fbeee6c9..752f2d4e 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 @@ -3,6 +3,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 com.hzs.system.board.vo.BoardRechargeAccountVO; import java.util.List; @@ -39,4 +40,11 @@ public interface BoardMapper { */ BoardAchieveVO getMonthAchieve(); + /** + * 各币种充值数据 + * + * @return + */ + List listAccountRechargeBoard(); + } 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 73afa57f..50b4808b 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 @@ -3,6 +3,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 com.hzs.system.board.vo.BoardRechargeAccountVO; import java.util.List; @@ -39,4 +40,11 @@ public interface IBoardService { */ BoardAchieveVO getMonthAchieve(); + /** + * 各币种充值数据 + * + * @return + */ + List listAccountRechargeBoard(); + } 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 1f827ab4..6794feb9 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 @@ -5,6 +5,7 @@ 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 com.hzs.system.board.vo.BoardRechargeAccountVO; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -39,4 +40,9 @@ public class BoardServiceImpl implements IBoardService { return boardMapper.getMonthAchieve(); } + @Override + public List listAccountRechargeBoard() { + return boardMapper.listAccountRechargeBoard(); + } + } 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 index 8c8abe7d..76cf0113 100644 --- 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 @@ -4,6 +4,9 @@ import lombok.Data; import java.io.Serializable; +/** + * 看板会员等级数据 + */ @Data public class BoardMemberLevelVO implements Serializable { 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 d88c4395..1ff562f8 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 @@ -29,7 +29,7 @@ public class BoardMemberVO implements Serializable { */ private Integer memberYesterday; /** - * 今日会员等级 + * 昨日会员等级 */ private List memberYesterdayLevelList; diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardRechargeAccountVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardRechargeAccountVO.java new file mode 100644 index 00000000..a8bffead --- /dev/null +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardRechargeAccountVO.java @@ -0,0 +1,28 @@ +package com.hzs.system.board.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 看板各币种充值数据 + */ +@Data +public class BoardRechargeAccountVO implements Serializable { + + /** + * 账户名称 + */ + private String accountName; + + /** + * 充值金额 + */ + private Integer rechargeAmount; + + /** + * 0=今日，1=昨日，2=当月 + */ + private Integer sort; + +} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardRechargeVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardRechargeVO.java new file mode 100644 index 00000000..03a6002a --- /dev/null +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardRechargeVO.java @@ -0,0 +1,30 @@ +package com.hzs.system.board.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 看板充值数据 + */ +@Data +public class BoardRechargeVO implements Serializable { + + /** + * 今日充值 + */ + private List rechargeTodayList; + + /** + * 昨日充值 + */ + private List rechargeYesterdayLevelList; + + /** + * 本月充值 + */ + private List rechargeMonthLevelList; + + +} 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 25f74204..3943adc7 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 @@ -161,4 +161,73 @@ ) b on 1 = 1 + + +