From eb7a808aaf7dd0a6dd2ff70f9ef3f8ce0b1e31d1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 五月 2026 18:27:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/dao/vo/OrdersExportVO.java | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/vo/OrdersExportVO.java b/server/services/src/main/java/com/doumee/dao/vo/OrdersExportVO.java
index 1466f5e..79754fd 100644
--- a/server/services/src/main/java/com/doumee/dao/vo/OrdersExportVO.java
+++ b/server/services/src/main/java/com/doumee/dao/vo/OrdersExportVO.java
@@ -11,51 +11,60 @@
@ExcelColumn(name = "璁㈠崟缂栧彿", index = 0)
private String code;
- @ExcelColumn(name = "鐗╁搧淇℃伅", index = 1)
+ @ExcelColumn(name = "鍏宠仈璁㈠崟鍙�", index = 1)
+ private String relationOrderCode;
+
+ @ExcelColumn(name = "鐗╁搧淇℃伅", index = 2)
private String goodsInfo;
- @ExcelColumn(name = "绫诲瀷", index = 2)
+ @ExcelColumn(name = "绫诲瀷", index = 3)
private String typeName;
- @ExcelColumn(name = "璁㈠崟绾у埆", index = 3)
+ @ExcelColumn(name = "璁㈠崟绾у埆", index = 4)
private String orderLevel;
- @ExcelColumn(name = "鐗╁搧淇濊垂(鍏�)", index = 4)
+ @ExcelColumn(name = "鐗╁搧淇濊垂(鍏�)", index = 5)
private String declaredFee;
- @ExcelColumn(name = "鍩虹鏈嶅姟璐�(鍏�)", index = 5)
+ @ExcelColumn(name = "鍩虹鏈嶅姟璐�(鍏�)", index = 6)
private String basicAmount;
- @ExcelColumn(name = "璁㈠崟鎬讳环(鍏�)", index = 6)
+ @ExcelColumn(name = "璁㈠崟鎬讳环(鍏�)", index = 7)
private String totalAmount;
- @ExcelColumn(name = "瀹炰粯鐜伴噾(鍏�)", index = 7)
+ @ExcelColumn(name = "瀹炰粯鐜伴噾(鍏�)", index = 8)
private String payAmount;
- @ExcelColumn(name = "鍔犳�ヨ垂(鍏�)", index = 8)
+ @ExcelColumn(name = "鍔犳�ヨ垂(鍏�)", index = 9)
private String urgentAmount;
- @ExcelColumn(name = "閫�娆鹃噾棰�(鍏�)", index = 9)
+ @ExcelColumn(name = "閫�娆鹃噾棰�(鍏�)", index = 10)
private String refundAmount;
- @ExcelColumn(name = "瓒呮椂閲戦(鍏�)", index = 10)
+ @ExcelColumn(name = "瓒呮椂閲戦(鍏�)", index = 11)
private String overdueAmount;
- @ExcelColumn(name = "寮傚父閲戦(鍏�)", index = 11)
+ @ExcelColumn(name = "寮傚父閲戦(鍏�)", index = 12)
private String exceptionAmount;
- @ExcelColumn(name = "浼樻儬鍒告姌鎵�(鍏�)", index = 12)
+ @ExcelColumn(name = "浼樻儬鍒告姌鎵�(鍏�)", index = 13)
private String deductionAmount;
- @ExcelColumn(name = "璁㈠崟鐘舵��", index = 13)
+ @ExcelColumn(name = "鍙告満琛ュ伩璐圭敤(鍏�)", index = 14)
+ private String exceptionFee;
+
+ @ExcelColumn(name = "闂ㄥ簵淇濈琛ヨ创(鍏�)", index = 15)
+ private String shopCompensationAmount;
+
+ @ExcelColumn(name = "璁㈠崟鐘舵��", index = 16)
private String statusDesc;
- @ExcelColumn(name = "缁撶畻鐘舵��", index = 14)
+ @ExcelColumn(name = "缁撶畻鐘舵��", index = 17)
private String settlementDesc;
- @ExcelColumn(name = "鏀粯鏃堕棿", index = 15, dateFormat = "yyyy-MM-dd HH:mm:ss", width = 16)
+ @ExcelColumn(name = "鏀粯鏃堕棿", index = 18, dateFormat = "yyyy-MM-dd HH:mm:ss", width = 16)
private Date payTime;
- @ExcelColumn(name = "鍒涘缓鏃堕棿", index = 16, dateFormat = "yyyy-MM-dd HH:mm:ss", width = 16)
+ @ExcelColumn(name = "鍒涘缓鏃堕棿", index = 19, dateFormat = "yyyy-MM-dd HH:mm:ss", width = 16)
private Date createTime;
}
--
Gitblit v1.9.3