From 9cfe1876df7e2a52978c9250a40475159b9c6b2a Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Sun, 18 Jan 2026 15:12:36 +0800 Subject: [PATCH] =?UTF-8?q?1.17=20=E8=B5=84=E9=87=91=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/Export/ExportServiceImpl.java | 2 +- src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java | 2 -- src/main/java/com/example/demo/domain/vo/cash/PerformanceVO.java | 2 ++ .../com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java | 1 + .../example/demo/serviceImpl/coin/ExportExcelServiceImpl.java | 9 +++++---- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/example/demo/Export/ExportServiceImpl.java b/src/main/java/com/example/demo/Export/ExportServiceImpl.java index 6dc5cf7..c94e4ed 100644 --- a/src/main/java/com/example/demo/Export/ExportServiceImpl.java +++ b/src/main/java/com/example/demo/Export/ExportServiceImpl.java @@ -382,7 +382,7 @@ public class ExportServiceImpl implements ExportService { @Override public Result addExportPerformance(PerformanceDTO dto) { - return addExport(dto, "业绩明细", "performance:queue:export_queue", "performanceVO", dto.getLang()); + return addExport(dto, "业绩明细", "performance:queue:export_queue", "performanceDTO", dto.getLang()); } @Override diff --git a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java index 5819b2d..c544bdb 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java +++ b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java @@ -55,9 +55,7 @@ public class FundsDTO { @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date endTime; - @ExcelIgnore private String refundCurrency; - private String refundCurrencyName; private BigDecimal refundAmount; @ExcelIgnore private Integer relatedId; diff --git a/src/main/java/com/example/demo/domain/vo/cash/PerformanceVO.java b/src/main/java/com/example/demo/domain/vo/cash/PerformanceVO.java index bbcf9de..adc8832 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/PerformanceVO.java +++ b/src/main/java/com/example/demo/domain/vo/cash/PerformanceVO.java @@ -33,5 +33,7 @@ public class PerformanceVO { private String receivedCurrency; // 到账币种 private BigDecimal receivedAmount; // 到账金额 private BigDecimal handlingCharge; // 手续费 + private String token; + private String lang; } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index 75754e1..715c216 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -660,6 +660,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone(); for (FundsDTO dto : list) { dto.setMarketName(regionMap.get(dto.getMarket())); dto.setPaymentCurrencyName(currencyMap.get(dto.getPaymentCurrency())); + dto.setReceivedCurrencyName(currencyMap.get(dto.getReceivedCurrency())); } // 8. 返回分页结果 diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java index aa5e526..4d867d7 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java @@ -16,6 +16,7 @@ import com.example.demo.controller.coin.ConsumeController; import com.example.demo.controller.coin.GoldDetailController; import com.example.demo.controller.coin.RechargeController; import com.example.demo.controller.coin.RefundController; +import com.example.demo.domain.DTO.PerformanceDTO; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.Export; import com.example.demo.domain.entity.User; @@ -418,9 +419,9 @@ public class ExportExcelServiceImpl implements ExportExcelService { try { JsonNode rootNode = objectMapper.readTree(message); JsonNode requestDataNode = rootNode.path("requestData"); - JsonNode beanRechargeNode = requestDataNode.path("performanceVO"); - PerformanceVO performanceVO = objectMapper.treeToValue(beanRechargeNode, PerformanceVO.class); - page.setPerformanceVO(performanceVO); + JsonNode beanRechargeNode = requestDataNode.path("performanceDTO"); + PerformanceDTO performanceDTO = objectMapper.treeToValue(beanRechargeNode, PerformanceDTO.class); + page.setPerformanceDTO(performanceDTO); // 从请求数据中获取语言设置，如果没有则使用默认值 String lang = "zh_CN"; JsonNode langNode = requestDataNode.path("lang"); @@ -1019,7 +1020,7 @@ public class ExportExcelServiceImpl implements ExportExcelService { case "cashUser": return CashCollection.class; case "performanceUser": - return PerformanceVO.class; + return PerformanceDTO.class; case "fundUser": return FundsDTO.class; default: