From 1f09f6daaf73bc83cceb4ae22b862b7b365635cf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 03 四月 2025 19:59:17 +0800
Subject: [PATCH] 修改反馈文档bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 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..d521575 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,23 +14,58 @@
@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;
+
/**
* 订单类型
*/
- @Excel(name = "订单类型", readConverterExp = "1=服务,2=单品")
+ @Excel(name = "订单类型", readConverterExp = "1=服务,2=单品(自提),3=单品(快递)")
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