From cb490e56ee7bccbc3b56d6964e9b68e5aa8ec475 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 17:16:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 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 85e22b0..fcd824e 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
@@ -1,6 +1,9 @@
package com.ruoyi.account.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.UserPoint;
import com.ruoyi.account.service.AppUserService;
@@ -9,17 +12,20 @@
import com.ruoyi.account.vo.UserPointStatistics;
import com.ruoyi.account.vo.UserPointVO;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import io.swagger.models.auth.In;
import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -43,6 +49,8 @@
private UserPointService userPointService;
@Resource
private AppUserService appUserService;
+ @Resource
+ private TokenService tokenService;
/**
@@ -110,17 +118,34 @@
* 积分统计
*/
@GetMapping("/statistics")
+ @ApiOperation(value = "积分统计", tags = "管理后台-财务统计-用户积分统计")
public R<UserPointStatistics> statistics(UserPoint userPoint) {
- List<AppUser> appUserList = appUserService.list();
- Integer totalPoint = 0;
- Integer consumePoint = 0;
- Integer sharePoint = 0;
- List<UserPoint> userPointList = userPointService.list();
- UserPointStatistics userPointStatistics = new UserPointStatistics();
- userPointStatistics.setTotalPoint(totalPoint);
- userPointStatistics.setConsumePoint(consumePoint);
- userPointStatistics.setSharePoint(sharePoint);
- return null;
+ return R.ok(userPointService.getStatistics(userPoint));
}
+
+ /**
+ * 变更记录
+ */
+ @GetMapping("/list")
+ @ApiOperation(value = "积分变更记录", tags = "管理后台-财务统计-用户积分统计")
+ public R<IPage<UserPoint>> list(UserPoint userPoint) {
+ IPage<UserPoint> userPointPage = userPointService.getUserPointPage(Page.of(userPoint.getPageNum(), userPoint.getPageSize()), userPoint);
+ return R.ok(userPointPage);
+ }
+
+
+ /**
+ * 导出
+ */
+ @GetMapping("/export")
+ @ApiOperation(value = "积分变更记录导出", tags = "管理后台-财务统计-用户积分统计")
+ public void export(HttpServletResponse response, UserPoint userPoint) {
+ IPage<UserPoint> userPointPage = userPointService.getUserPointPage(Page.of(1, Integer.MAX_VALUE), userPoint);
+ List<UserPoint> userPointList = userPointPage.getRecords();
+ ExcelUtil<UserPoint> util = new ExcelUtil<>(UserPoint.class);
+ util.exportExcel(response, userPointList, "用户积分统计");
+ }
+
+
}
--
Gitblit v1.7.1