From 210828d1a6947596fe00ab30fcd8725c6714dde4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 02 一月 2025 21:04:16 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 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 708193d..9afbe26 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
@@ -6,7 +6,6 @@
import com.ruoyi.account.api.model.UserPoint;
import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.service.UserPointService;
-import com.ruoyi.account.vo.CommissionStatistics;
import com.ruoyi.account.vo.UserPointDetailVO;
import com.ruoyi.account.vo.UserPointStatistics;
import com.ruoyi.account.vo.UserPointVO;
@@ -131,6 +130,14 @@
return R.ok(userPointPage);
}
+ @GetMapping("/user/list")
+ @ApiOperation(value = "积分管理-用户积分明细(必传用户id)", tags = "后台")
+ public R<Page<UserPoint>> userlist(UserPoint userPoint) {
+ Page<UserPoint> page = userPointService.lambdaQuery().eq(UserPoint::getAppUserId, userPoint.getAppUserId()).orderByDesc(UserPoint::getCreateTime).page(Page.of(userPoint.getPageNum(), userPoint.getPageSize()));
+ return R.ok(page);
+ }
+
+
/**
* 导出
@@ -142,21 +149,6 @@
List<UserPoint> userPointList = userPointPage.getRecords();
ExcelUtil<UserPoint> util = new ExcelUtil<>(UserPoint.class);
util.exportExcel(response, userPointList, "用户积分统计");
- }
-
- /**
- * 用户分佣统计
- */
- @GetMapping("/commissionStatistics")
- @ApiOperation(value = "用户分佣统计", tags = "管理后台-财务统计-用户分佣统计")
- public R<CommissionStatistics> commissionStatistics(UserPoint userPoint) {
- userPoint.setType(2);
- IPage<UserPoint> userPointPage = userPointService.getUserPointPage(Page.of(userPoint.getPageNum(), userPoint.getPageSize()), userPoint);
- UserPointStatistics statistics = userPointService.getStatistics(userPoint);
- CommissionStatistics commissionStatistics = new CommissionStatistics();
- commissionStatistics.setStatistics(statistics);
- commissionStatistics.setUserPointPage(userPointPage);
- return R.ok(commissionStatistics);
}
--
Gitblit v1.7.1