From e6fbd6ab52c3cf4ffe383d3a8faa5ea1466928fb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 九月 2026 18:05:38 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCompanyRechargeRecordServiceImpl.java | 1 -
ruoyi-service/ruoyi-other/src/test/java/com/ruoyi/other/service/impl/TCompanyRechargeRecordServiceImplTest.java | 1 -
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/CompanyRechargeRecordExcelDTO.java | 7 ++-----
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/CompanyRechargeRecordExcelDTO.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/CompanyRechargeRecordExcelDTO.java
index b800af3..45d0178 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/CompanyRechargeRecordExcelDTO.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/CompanyRechargeRecordExcelDTO.java
@@ -31,13 +31,10 @@
@Excel(name = "到账金额", sort = 5, width = 14, scale = 2)
private BigDecimal arrivalAmount;
- @Excel(name = "充值状态", sort = 6, width = 12, readConverterExp = "1=成功,2=失败,3=已退款")
- private Integer status;
-
- @Excel(name = "充值人", sort = 7, width = 16)
+ @Excel(name = "充值人", sort = 6, width = 16)
private String operatorName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Excel(name = "充值时间", sort = 8, width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "充值时间", sort = 7, width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime rechargeTime;
}
\ No newline at end of file
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCompanyRechargeRecordServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCompanyRechargeRecordServiceImpl.java
index 9d24ae2..7e2619f 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCompanyRechargeRecordServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCompanyRechargeRecordServiceImpl.java
@@ -182,7 +182,6 @@
dto.setPayAmount(r.getPayAmount());
dto.setGiftAmount(r.getGiftAmount());
dto.setArrivalAmount(r.getArrivalAmount());
- dto.setStatus(r.getStatus());
dto.setOperatorName(r.getOperatorName());
dto.setRechargeTime(r.getRechargeTime());
return dto;
diff --git a/ruoyi-service/ruoyi-other/src/test/java/com/ruoyi/other/service/impl/TCompanyRechargeRecordServiceImplTest.java b/ruoyi-service/ruoyi-other/src/test/java/com/ruoyi/other/service/impl/TCompanyRechargeRecordServiceImplTest.java
index 15c2738..75f79ae 100644
--- a/ruoyi-service/ruoyi-other/src/test/java/com/ruoyi/other/service/impl/TCompanyRechargeRecordServiceImplTest.java
+++ b/ruoyi-service/ruoyi-other/src/test/java/com/ruoyi/other/service/impl/TCompanyRechargeRecordServiceImplTest.java
@@ -219,7 +219,6 @@
assertEquals("CR20260930101500001", dto.getSerialNo());
assertEquals("A公司", dto.getCompanyName());
assertEquals(new BigDecimal("120"), dto.getArrivalAmount());
- assertEquals(1, dto.getStatus());
assertEquals("张三", dto.getOperatorName());
assertNotEquals(null, dto.getRechargeTime());
}
--
Gitblit v1.7.1