20260411 业绩归属、资金流水导出优化

src/main/java/com/example/demo/Util/ExcelHeaderTranslator.java

@@ -524,13 +524,18 @@ public class ExcelHeaderTranslator {
         // 定义所有表头的原始中文名称（对应 PerformanceVO 类的字段）
         headers.put("jwcode", "精网号");
         headers.put("name", "姓名");
-        headers.put("marketName", "所属地区");
         headers.put("orderCode", "金币订单号");
-        headers.put("paymentCurrency", "付款币种");
         headers.put("paymentAmount", "付款金额");
         headers.put("receivedCurrency", "到账币种");
         headers.put("receivedAmount", "到账金额");
         headers.put("handlingCharge", "手续费");
+        headers.put("receivedMarketName", "到账地区");
+        headers.put("performanceMarketName", "收款地区");
+        headers.put("goodsName", "商品名称");
+        headers.put("remark", "备注");
+        headers.put("goodNum", "商品数量");
+        headers.put("payType", "付款方式");
+        headers.put("payTime", "付款时间");
 
         // 如果需要翻译，则翻译表头
         if (!isChineseLanguage(lang)) {
@@ -545,8 +550,9 @@ public class ExcelHeaderTranslator {
      */
     public List<String> getPerformanceColumnOrder() {
         return Arrays.asList(
-                "jwcode", "name", "marketName", "orderCode", "paymentCurrency", "paymentAmount",
-                "receivedCurrency", "receivedAmount", "handlingCharge"
+                "jwcode", "name", "orderCode", "paymentAmount", "receivedCurrency",
+                "receivedAmount", "handlingCharge", "receivedMarketName", "performanceMarketName",
+                "goodsName", "remark", "goodNum", "payType", "payTime"
         );
     }
 
@@ -558,19 +564,22 @@ public class ExcelHeaderTranslator {
         Map<String, String> headers = new LinkedHashMap<>();
 
         // 添加所有表头的原始中文名称（对应 FundsDTO 类的字段）
-        headers.put("id", "序号");
+        headers.put("id", "ID");
         headers.put("orderCode", "金币订单号");
         headers.put("receivedMarket", "到账地区");
         headers.put("performanceMarket", "业绩归属地区");
+        headers.put("activityName", "活动名称");
         headers.put("name", "姓名");
         headers.put("jwcode", "精网号");
         headers.put("remark", "备注");
         headers.put("goodNum", "商品数量");
         headers.put("goodsName", "商品名称");
+        headers.put("voucher", "转账凭证");
         headers.put("payType", "付款类型");
         headers.put("paymentAmount", "付款金额");
         headers.put("handlingCharge", "手续费");
         headers.put("receivedAmount", "到账金额");
+        headers.put("receivedTime", "到账时间");
         headers.put("marketName", "所属地区");
         headers.put("paymentCurrencyName", "付款币种");
         headers.put("receivedCurrencyName", "到账币种");
@@ -591,10 +600,11 @@ public class ExcelHeaderTranslator {
      */
     public List<String> getFundsColumnOrder() {
         return Arrays.asList(
-                "id", "orderCode", "receivedMarket", "performanceMarket", "name", "jwcode",
-                "remark", "goodNum", "goodsName", "payType", "paymentAmount", "handlingCharge",
-                "receivedAmount", "marketName", "paymentCurrencyName", "receivedCurrencyName",
-                "statusName", "refundCurrency", "refundAmount"
+                "id", "orderCode", "receivedMarket", "performanceMarket", "activityName",
+                "name", "jwcode", "remark", "goodNum", "goodsName", "voucher", "payType",
+                "paymentAmount", "handlingCharge", "receivedAmount", "receivedTime",
+                "marketName", "paymentCurrencyName", "receivedCurrencyName", "statusName",
+                "refundCurrency", "refundAmount"
         );
     }
 

src/main/java/com/example/demo/domain/vo/cash/PerformanceVO.java

@@ -26,15 +26,19 @@ public class PerformanceVO {
     private String name;                   // 姓名
     @ExcelIgnore
     private Integer market;              // 所属地区
+    @ExcelIgnore
     private String marketName;              // 所属地区
     private String orderCode;           // 金币订单号
+    @ExcelIgnore
     private String paymentCurrency;     // 付款币种
     private BigDecimal paymentAmount;   // 付款金额
     private String receivedCurrency;    // 到账币种
     private BigDecimal receivedAmount;  // 到账金额
     private BigDecimal handlingCharge;  // 手续费
+    @ExcelIgnore
     private String receivedMarket;      // 到账地区
     private String receivedMarketName;  // 到账地区名称
+    @ExcelIgnore
     private String performanceMarket;   // 收款地区
     private String performanceMarketName; // 收款地区名称
     private String goodsName;           // 商品名称