From a823bffa3800426d0a908b9397a8ea7586b5be21 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 18:00:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java | 40 ++--------------------------------------
1 files changed, 2 insertions(+), 38 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 e43b425..440d198 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
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.dto.BalanceQuery;
-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;
@@ -15,8 +14,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -70,41 +67,8 @@
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, "用户分佣统计");
+ ExcelUtil<BalanceChangeRecord> util = new ExcelUtil<>(BalanceChangeRecord.class);
+ util.exportExcel(response, userPointList, "用户分佣统计");
}
--
Gitblit v1.7.1