diff --git a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java index 1ab7269..342ce65 100644 --- a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java +++ b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java @@ -549,6 +549,48 @@ public class ExcelHeaderTranslator { } /** + * 获取资金流水的Excel表头映射 + * 返回 Map<字段名, 中文表头> + */ + public Map getFundsHeaders(String lang) { + Map headers = new LinkedHashMap<>(); + + // 添加所有表头的原始中文名称(对应 FundsDTO 类的字段) + headers.put("id", "序号"); + headers.put("jwcode", "精网号"); + headers.put("name", "姓名"); + headers.put("marketName", "所属地区"); + headers.put("orderCode", "金币订单号"); + headers.put("paymentCurrencyName", "付款币种"); + headers.put("paymentAmount", "付款金额"); + headers.put("receivedCurrencyName", "到账币种"); + headers.put("receivedAmount", "到账金额"); + headers.put("handlingCharge", "手续费"); + headers.put("payType", "付款类型"); + headers.put("statusName", "退款状态"); + headers.put("refundCurrencyName", "退款币种"); + headers.put("refundAmount", "退款金额"); + + // 如果需要翻译,则翻译表头 + if (!isChineseLanguage(lang)) { + return translateHeaders(headers, lang); + } + + return headers; + } + + /** + * 获取资金流水表头顺序 + */ + public List getFundsColumnOrder() { + return Arrays.asList( + "id", "jwcode", "name", "marketName", "orderCode", "paymentCurrencyName", "paymentAmount", + "receivedCurrencyName", "receivedAmount", "handlingCharge", "payType", "statusName", "refundCurrencyName", + "refundAmount" + ); + } + + /** * 翻译表头 */ private Map translateHeaders(Map headers, String lang) { 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 cde3577..5819b2d 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 @@ -25,20 +25,29 @@ public class FundsDTO { private Integer id; private Integer jwcode; private String name; + @ExcelIgnore private Integer market; private String marketName; + @ExcelIgnore private List markets; private String orderCode; + @ExcelIgnore private Integer paymentCurrency; + private String paymentCurrencyName; private BigDecimal paymentAmount; + @ExcelIgnore private String receivedCurrency; + private String receivedCurrencyName; private BigDecimal receivedAmount; private BigDecimal handlingCharge; private String payType; @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date payTime; + @ExcelIgnore private Integer status; + private String statusName; + @ExcelIgnore private List statuses; @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @@ -46,11 +55,14 @@ 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; + @ExcelIgnore private String token; + @ExcelIgnore private String lang; - private String paymentCurrencyName; - private PerformanceVO performanceVO; } diff --git a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java index 72f5e79..e298016 100644 --- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java +++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java @@ -71,7 +71,6 @@ public interface CashCollectionMapper { @Param("auditId") Integer auditId, @Param("version") Integer version); - List performanceSelect(PerformanceVO performanceDTO); List performanceSelect(PerformanceDTO performanceDTO);