1.17 资金流水导出

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

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;

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;
 
 }

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. 返回分页结果

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: