From 0406a3a2f3cfb2b081f4ca94352f19f301685c84 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 18 十二月 2024 11:39:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java | 74 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 6 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 3ed2f97..e43b425 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
@@ -1,19 +1,23 @@
package com.ruoyi.account.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.BalanceChangeRecord;
-import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.account.dto.BalanceQuery;
-import com.ruoyi.account.dto.UserCancelQuery;
+import com.ruoyi.account.excel.BalanceChangeRecordEX;
import com.ruoyi.account.service.BalanceChangeRecordService;
+import com.ruoyi.account.vo.CommissionStatistics;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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;
/**
* @author zhibing.pu
@@ -45,6 +49,64 @@
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, BalanceChangeRecord balanceChangeRecord) {
+ CommissionStatistics commissionStatistics1 = balanceChangeRecordService.commissionStatistics(Page.of(1, Integer.MAX_VALUE), balanceChangeRecord);
+ IPage<BalanceChangeRecord> userPointPage = commissionStatistics1.getUserPointPage();
+ List<BalanceChangeRecord> userPointList = userPointPage.getRecords();
+ List<BalanceChangeRecordEX> userPointExList = new ArrayList<>();
+ for (BalanceChangeRecord balanceChangeRecord1 : userPointList) {
+ BalanceChangeRecordEX balanceChangeRecordEX = new BalanceChangeRecordEX();
+ balanceChangeRecordEX.setUserName(balanceChangeRecord1.getUserName());
+ balanceChangeRecordEX.setPhone(balanceChangeRecord1.getUserPhone());
+ balanceChangeRecordEX.setChangeTime(balanceChangeRecord1.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ balanceChangeRecordEX.setChangeNum(balanceChangeRecord1.getAfterAmount().toString());
+ Integer type = balanceChangeRecord1.getChangeType();
+ // 类型：1充值2提现3红包4分佣5商城购物6订单取消回退
+ switch (type) {
+ case 1:
+ balanceChangeRecordEX.setType("充值");
+ break;
+ case 2:
+ balanceChangeRecordEX.setType("提现");
+ break;
+ case 3:
+ balanceChangeRecordEX.setType("红包");
+ break;
+ case 4:
+ balanceChangeRecordEX.setType("分佣");
+ break;
+ case 5:
+ balanceChangeRecordEX.setType("商城购物");
+ break;
+ case 6:
+ balanceChangeRecordEX.setType("订单取消回退");
+ break;
+ default:
+ balanceChangeRecordEX.setType("未知积分");
+ }
+ userPointExList.add(balanceChangeRecordEX);
+ }
+ ExcelUtil<BalanceChangeRecordEX> util = new ExcelUtil<>(BalanceChangeRecordEX.class);
+ util.exportExcel(response, userPointExList, "用户分佣统计");
+ }
+
}
--
Gitblit v1.7.1