From f615ec5c9239327740948501627545f8e78e2a9e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 18 三月 2025 09:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 4 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 bf204f3..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,17 +14,64 @@
@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=单品")
private String orderType;
+
+
+
+ /**
+ * 收货地址
+ */
+ @Excel(name = "收货地址")
+ private String address;
/**
* 下单时间
@@ -61,8 +108,14 @@
/**
* 成本价
*/
- @Excel(name = "成本价")
- private BigDecimal costPrice;
+ @Excel(name = "公司运营成本")
+ private BigDecimal companyCostPrice;
+
+ /**
+ * 成本价
+ */
+ @Excel(name = "门店、供应商成本")
+ private BigDecimal supplierCostPrice;
/**
* 支付金额
@@ -109,4 +162,10 @@
*/
@Excel(name = "市区划代码")
private String cityCode;
+
+ private String addressJson;
+
+
+
+
}
--
Gitblit v1.7.1