From c27c1f2beb4ca89a94eaa854fce6b4553db8f2f8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 19:58:12 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java | 171 ++++++++++++++++++++++++--------------------------------
1 files changed, 74 insertions(+), 97 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java
index 5c5a224..49f11fc 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java
@@ -2,24 +2,22 @@
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.BalanceChangeRecord;
-import com.ruoyi.account.api.model.UserClickLog;
-import com.ruoyi.account.api.model.UserPoint;
import com.ruoyi.account.dto.BalanceQuery;
-import com.ruoyi.account.dto.UserCancelQuery;
-import com.ruoyi.account.excel.UserPointEx;
import com.ruoyi.account.service.BalanceChangeRecordService;
+import com.ruoyi.account.vo.CommissionDetail;
import com.ruoyi.account.vo.CommissionStatistics;
-import com.ruoyi.account.vo.UserPointStatistics;
+import com.ruoyi.account.vo.WalletStatistics;
+import com.ruoyi.account.vo.WalletStatisticsDetail;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -29,101 +27,80 @@
@RestController
@RequestMapping("/balanceChangeRecord")
public class BalanceChangeRecordController {
-
- @Resource
- private BalanceChangeRecordService balanceChangeRecordService;
-
-
- /**
- * 保存账户流水记录
- * @param balanceChangeRecord
- * @return
- */
- @PostMapping("/saveBalanceChangeRecord")
- public R saveBalanceChangeRecord(@RequestBody BalanceChangeRecord balanceChangeRecord){
- balanceChangeRecordService.save(balanceChangeRecord);
- return R.ok();
- }
- @PostMapping("/page")
- @ApiOperation(value = "余额变更明细", tags = {"后台"})
- public R<IPage<BalanceChangeRecord>> page(@RequestBody BalanceQuery agentQuery) {
+ @Resource
+ private BalanceChangeRecordService balanceChangeRecordService;
- return R.ok(balanceChangeRecordService.pageList(agentQuery));
- }
-// /**
-// * 用户分佣统计
-// */
-// @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);
-// }
-//
+ /**
+ * 保存账户流水记录
+ *
+ * @param balanceChangeRecord
+ * @return
+ */
+ @PostMapping("/saveBalanceChangeRecord")
+ public R saveBalanceChangeRecord(@RequestBody BalanceChangeRecord balanceChangeRecord) {
+ balanceChangeRecordService.save(balanceChangeRecord);
+ return R.ok();
+ }
+
+ @PostMapping("/page")
+ @ApiOperation(value = "余额变更明细", tags = {"后台"})
+ public R<IPage<BalanceChangeRecord>> page(@RequestBody BalanceQuery agentQuery) {
+
+ return R.ok(balanceChangeRecordService.pageList(agentQuery));
+ }
+
+ /**
+ * 用户分佣统计
+ */
+ @GetMapping("/commissionStatistics")
+ @ApiOperation(value = "用户分佣统计", tags = "管理后台-财务统计-用户分佣统计")
+ public R<CommissionStatistics> commissionStatistics(@ApiParam("页码") @RequestParam Integer pageNum,
+ @ApiParam("每一页数据大小") Integer pageSize,
+ BalanceChangeRecord balanceChangeRecord) {
+ CommissionStatistics commissionStatistics1 = balanceChangeRecordService.commissionStatistics(Page.of(pageNum, pageSize), balanceChangeRecord);
+ return R.ok(commissionStatistics1);
+ }
+
+ //
// /**
// * 导出用户分佣统计
// */
-// @GetMapping("/commissionExport")
-// @ApiOperation(value = "用户分佣统计导出", tags = "管理后台-财务统计-用户分佣统计")
-// public void commissionExport(HttpServletResponse response, UserPoint userPoint) {
-// userPoint.setType(2);
-// IPage<UserPoint> userPointPage = userPointService.getUserPointPage(Page.of(1, Integer.MAX_VALUE), userPoint);
-// List<UserPoint> userPointList = userPointPage.getRecords();
-// List<UserPointEx> userPointExList = new ArrayList<>();
-// for (UserPoint point : userPointList) {
-// UserPointEx userPointEx = new UserPointEx();
-// userPointEx.setUserName(point.getUserName());
-// userPointEx.setPhone(point.getPhone());
-// userPointEx.setChangeTime(point.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-// userPointEx.setChangeNum(point.getVariablePoint().toString());
-// Integer type = point.getType();
-// switch (type) {
-// case 1:
-// userPointEx.setType("消费积分");
-// break;
-// case 2:
-// userPointEx.setType("返佣积分");
-// break;
-// case 3:
-// userPointEx.setType("拉新人积分");
-// break;
-// case 4:
-// userPointEx.setType("兑换商品");
-// break;
-// case 5:
-// userPointEx.setType("门店业绩");
-// break;
-// case 6:
-// userPointEx.setType("门店返佣");
-// break;
-// case 7:
-// userPointEx.setType("技师业绩");
-// break;
-// case 8:
-// userPointEx.setType("转赠积分");
-// break;
-// case 9:
-// userPointEx.setType("做工积分");
-// break;
-// case 10:
-// userPointEx.setType("注册积分");
-// break;
-// default:
-// userPointEx.setType("未知积分");
-// }
-// userPointExList.add(userPointEx);
-// }
-// ExcelUtil<UserPointEx> util = new ExcelUtil<>(UserPointEx.class);
-// util.exportExcel(response, userPointExList, "用户分佣统计");
-// }
+ @GetMapping("/commissionExport")
+ @ApiOperation(value = "用户分佣统计导出", tags = "管理后台-财务统计-用户分佣统计")
+ public void commissionExport(HttpServletResponse response, BalanceChangeRecord balanceChangeRecord) {
+ CommissionStatistics commissionStatistics1 = balanceChangeRecordService.commissionStatistics(Page.of(1, Integer.MAX_VALUE), balanceChangeRecord);
+ IPage<BalanceChangeRecord> userPointPage = commissionStatistics1.getUserPointPage();
+ List<BalanceChangeRecord> userPointList = userPointPage.getRecords();
+ ExcelUtil<BalanceChangeRecord> util = new ExcelUtil<>(BalanceChangeRecord.class);
+ util.exportExcel(response, userPointList, "用户分佣统计");
+ }
-
-
+
+ /**
+ * 钱包统计
+ */
+ @GetMapping("/walletStatistics")
+ @ApiOperation(value = "钱包统计", tags = "管理后台-财务统计-钱包统计")
+ public R<WalletStatistics> walletStatistics(@ApiParam("页码") @RequestParam Integer pageNum,
+ @ApiParam("每一页数据大小") Integer pageSize,
+ BalanceChangeRecord balanceChangeRecord) {
+ WalletStatistics walletStatistics = balanceChangeRecordService.walletStatistics(Page.of(pageNum, pageSize), balanceChangeRecord);
+ return R.ok(walletStatistics);
+ }
+
+ /**
+ * 钱包统计导出
+ */
+ @GetMapping("/walletExport")
+ @ApiOperation(value = "钱包统计导出", tags = "管理后台-财务统计-钱包统计")
+ public void walletExport(HttpServletResponse response, BalanceChangeRecord balanceChangeRecord) {
+ WalletStatistics walletStatistics = balanceChangeRecordService.walletStatistics(Page.of(1, Integer.MAX_VALUE), balanceChangeRecord);
+ IPage<WalletStatisticsDetail> userPointPage = walletStatistics.getPage();
+ List<WalletStatisticsDetail> userPointList = userPointPage.getRecords();
+ ExcelUtil<WalletStatisticsDetail> util = new ExcelUtil<>(WalletStatisticsDetail.class);
+ util.exportExcel(response, userPointList, "钱包统计");
+ }
+
}
--
Gitblit v1.7.1