diff --git a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java index df3c66a..81fa1ce 100644 --- a/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java +++ b/src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java @@ -237,6 +237,7 @@ public class ExcelHeaderTranslator { headers.put("id", "序号"); headers.put("jwcode", "精网号"); headers.put("name", "姓名"); + headers.put("performanceMarket", "业绩归属地区"); headers.put("marketName", "所属地区"); headers.put("activity", "活动名称"); headers.put("orderCode", "金币订单号"); @@ -273,7 +274,7 @@ public class ExcelHeaderTranslator { */ public List getCashCollectionColumnOrder() { return Arrays.asList( - "id", "jwcode", "name", "marketName", "activity", "orderCode", "bankCode", + "id", "jwcode", "name", "performanceMarket", "marketName", "activity", "orderCode", "bankCode", "goodsName", "goodNum", "numUnit", "permanentGold", "freeGold", "paymentCurrency", "paymentAmount", "receivedCurrency", "receivedAmount", "handlingCharge", "receivedMarket", "payType", "payTime", "receivedTime", "submitterName", @@ -558,16 +559,21 @@ public class ExcelHeaderTranslator { // 添加所有表头的原始中文名称(对应 FundsDTO 类的字段) headers.put("id", "序号"); - headers.put("jwcode", "精网号"); + headers.put("orderCode", "金币订单号"); + headers.put("receivedMarket", "到账地区"); + headers.put("performanceMarket", "业绩归属地区"); headers.put("name", "姓名"); + headers.put("jwcode", "精网号"); + headers.put("remark", "备注"); + headers.put("goodNum", "商品数量"); + headers.put("goodsName", "商品名称"); + headers.put("payType", "付款类型"); + headers.put("paymentAmount", "付款金额"); + headers.put("handlingCharge", "手续费"); + headers.put("receivedAmount", "到账金额"); 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("refundCurrency", "退款币种"); headers.put("refundAmount", "退款金额"); @@ -585,9 +591,10 @@ public class ExcelHeaderTranslator { */ public List getFundsColumnOrder() { return Arrays.asList( - "id", "jwcode", "name", "marketName", "orderCode", "paymentCurrencyName", "paymentAmount", - "receivedCurrencyName", "receivedAmount", "handlingCharge", "payType", "statusName", "refundCurrency", - "refundAmount" + "id", "orderCode", "receivedMarket", "performanceMarket", "name", "jwcode", + "remark", "goodNum", "goodsName", "payType", "paymentAmount", "handlingCharge", + "receivedAmount", "marketName", "paymentCurrencyName", "receivedCurrencyName", + "statusName", "refundCurrency", "refundAmount" ); }