From 04ce420613f90f8414e87e8fe68484fc32485349 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 24 六月 2025 18:49:06 +0800
Subject: [PATCH] 部署
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
index 1c0e0cc..a36874c 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
@@ -210,10 +210,11 @@
@GetMapping("/getUserPontDetailPageList")
@ApiOperation(value = "用户积分详情", tags = "管理后台-财务统计-用户积分统计")
public R<PageInfo<UserPointDetailVO>> getUserPontDetailPageList(@RequestParam(value = "types",required = false) Collection<Integer> types,
+ @RequestParam(value = "objectIdStr",required = false) String objectIdStr,
@RequestParam(value = "id") Long id,
@ApiParam("当前页")@RequestParam("pageCurr") Integer pageCurr,
@ApiParam("分页大小")@RequestParam("pageSize") Integer pageSize) {
- PageInfo<UserPointDetailVO> pageInfo=userPointService.getUserPontDetailPageList(types,id,pageCurr,pageSize);
+ PageInfo<UserPointDetailVO> pageInfo=userPointService.getUserPontDetailPageList(types, objectIdStr,id,pageCurr,pageSize);
return R.ok(pageInfo);
}
@@ -223,14 +224,30 @@
*/
@GetMapping("/getUserPointStatisticsPageList")
@ApiOperation(value = "用户积分统计", tags = "管理后台-财务统计-用户积分统计")
- public R<UserPointStatisticsOutVO> getUserPointStatisticsPageList(@RequestParam(value = "types",required = false) Collection<Integer> types,
+ public R<PageInfo<UserPointStatisticsPageVO>> getUserPointStatisticsPageList(@RequestParam(value = "types",required = false) Collection<Integer> types,
@RequestParam(value = "name",required = false) String name,
@RequestParam(value = "phone",required = false) String phone,
- @RequestParam(value = "beginTime",required = false) LocalDateTime beginTime,
- @RequestParam(value = "endTime",required = false) LocalDateTime endTime,
+ @RequestParam(value = "beginTime",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,
+ @RequestParam(value = "endTime",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime,
@ApiParam("当前页")@RequestParam("pageCurr") Integer pageCurr,
@ApiParam("分页大小")@RequestParam("pageSize") Integer pageSize) {
- UserPointStatisticsOutVO userPointStatisticsOutVO = new UserPointStatisticsOutVO();
+ //查找记录
+ PageInfo<UserPointStatisticsPageVO> pageInfo=userPointService.getUserPointStatisticsPageList(types,name,phone,beginTime,endTime,pageCurr,pageSize);
+ return R.ok(pageInfo);
+ }
+
+ /**
+ * 用户积分统计
+ */
+ @GetMapping("/getUserPointStatisticsTop")
+ @ApiOperation(value = "用户积分统计-顶部", tags = "管理后台-财务统计-用户积分统计")
+ public R<UserPointStatisticsTopVO> getUserPointStatisticsTop(@RequestParam(value = "types",required = false) Collection<Integer> types,
+ @RequestParam(value = "name",required = false) String name,
+ @RequestParam(value = "phone",required = false) String phone,
+ @RequestParam(value = "beginTime",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,
+ @RequestParam(value = "endTime",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime
+ ) {
+ UserPointStatisticsTopVO userPointStatisticsOutVO = new UserPointStatisticsTopVO();
//充值绿电分
Integer chargePoint=userPointService.selectRechargeAndUse(name,phone,beginTime,endTime,17);
@@ -240,11 +257,6 @@
Integer usePoint=(exchangePoint==null?0:exchangePoint )-( cancelPoint==null?0:cancelPoint);
userPointStatisticsOutVO.setChargeTotalPoint(chargePoint==null?0:chargePoint);
userPointStatisticsOutVO.setUseTotalPoint(usePoint);
-
- //查找记录
- PageInfo<UserPointStatisticsPageVO> pageInfo=userPointService.getUserPointStatisticsPageList(types,name,phone,beginTime,endTime,pageCurr,pageSize);
- userPointStatisticsOutVO.setPageInfo(pageInfo);
-
return R.ok(userPointStatisticsOutVO);
}
@@ -258,8 +270,8 @@
@RequestParam(value = "types",required = false) Collection<Integer> types,
@RequestParam(value = "name",required = false) String name,
@RequestParam(value = "phone",required = false) String phone,
- @RequestParam(value = "beginTime",required = false) LocalDateTime beginTime,
- @RequestParam(value = "endTime",required = false) LocalDateTime endTime){
+ @RequestParam(value = "beginTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,
+ @RequestParam(value = "endTime",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime){
List<UserPointExcel> exportList =userPointMapper.userPointExcel(types,name,phone,beginTime,endTime);
exportList.forEach(x->{
if (x.getType()==12||x.getType()==17){
--
Gitblit v1.7.1