From e23242d09e31e1c78f7ecdbc2859c9f99a3c4171 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期一, 17 三月 2025 10:00:59 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java
index 8ec9ae5..d6d3b3b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java
@@ -14,11 +14,50 @@
@Excel(name = "订单状态" , readConverterExp = "1=待发货,2=待收货,3=待使用,4=已完成,5=已取消,6=已退款,7=售后中,8=已评价")
private String orderStatus;
+
/**
- * 订单编号
+ * 交易单号
*/
- @Excel(name = "订单编号")
+ @Excel(name = "交易单号")
+ private String serialNumber;
+
+ /**
+ * 商户单号
+ */
+ @Excel(name = "商户单号")
private String orderNumber;
+
+ /**
+ * 商户号
+ */
+ @Excel(name = "商户号")
+ private String tradeMerchantNo = "729677708";
+
+ /**
+ * 发货方式
+ */
+ @Excel(name = "发货方式", readConverterExp = "1=快递,2=自提")
+ private String distributionMode;
+
+ /**
+ * 发货模式
+ */
+ @Excel(name = "发货模式")
+ private String deliveryMode = "统一发货";
+
+
+ /**
+ * 是否完成发货
+ */
+ @Excel(name = "是否完成发货")
+ private String isDelivery;
+
+ /**
+ * 是否重新发货
+ */
+ @Excel(name = "是否重新发货")
+ private String isReDelivery;
+
/**
* 订单类型
@@ -26,11 +65,7 @@
@Excel(name = "订单类型", readConverterExp = "1=服务,2=单品")
private String orderType;
- /**
- * 配送方式
- */
- @Excel(name = "配送方式", readConverterExp = "1=快递,2=自提")
- private String distributionMode;
+
/**
* 收货地址
@@ -129,4 +164,8 @@
private String cityCode;
private String addressJson;
+
+
+
+
}
--
Gitblit v1.7.1