From 5843585adea107e2232a569ba733d0cd728aace3 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 18 十二月 2024 17:33:26 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/BalanceChangeRecordController.java | 37 ++-----------------------------------
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java | 6 ++++++
2 files changed, 8 insertions(+), 35 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java
index 1b8ccc4..44f58b2 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/BalanceChangeRecord.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -34,12 +35,14 @@
private Long orderId;
@ApiModelProperty("类型：1充值2提现3红包4分佣5商城购物6订单取消回退")
+ @Excel(name = "变更类型", readConverterExp = "1=充值,2=提现,3=红包,4=分佣,5=商城购物,6=订单取消回退")
private Integer changeType;
@ApiModelProperty("变更前金额")
private BigDecimal beforeAmount;
@ApiModelProperty("变更金额")
+ @Excel(name = "变更数量")
private BigDecimal changeAmount;
@ApiModelProperty("变更后金额")
@@ -49,14 +52,17 @@
private Integer delFlag;
@ApiModelProperty("添加时间")
+ @Excel(name = "变更时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@TableField(exist = false)
@ApiModelProperty("消费用户名称")
+ @Excel(name = "用户名称")
private String userName;
@TableField(exist = false)
@ApiModelProperty("消费用户手机号")
+ @Excel(name = "联系电话")
private String userPhone;
@TableField(exist = false)
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..3574cfd 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
@@ -70,41 +70,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