From 4ddf8b517a730a7cf5d60ff1755f3e38b98fda01 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 20 十二月 2024 15:03:46 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 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 c1c56d4..630e94f 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
@@ -5,8 +5,10 @@
import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.dto.BalanceQuery;
import com.ruoyi.account.service.BalanceChangeRecordService;
+import com.ruoyi.account.vo.CommissionDetail;
import com.ruoyi.account.vo.CommissionStatistics;
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;
@@ -87,5 +89,33 @@
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, "钱包统计");
+ }
+
+ /**
+ * 分佣统计明细
+ */
+ @GetMapping("/commissionDetail")
+ @ApiOperation(value = "分佣统计", tags = "管理后台-首页统计")
+ public R<CommissionDetail> commissionDetail(@ApiParam("页码") @RequestParam Integer pageNum,
+ @ApiParam("每一页数据大小") Integer pageSize,
+ BalanceChangeRecord balanceChangeRecord) {
+
+
+
+// return R.ok(balanceChangeRecordService.pageList(balanceChangeRecord));
+ return null;
+ }
+
}
--
Gitblit v1.7.1