From 0449a6264819bce3869f47b9e5bd3729f158db54 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期五, 14 三月 2025 16:05:24 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 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 3405fa0..8ec9ae5 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
@@ -11,20 +11,32 @@
/**
* 订单状态
*/
- @Excel(name = "订单状态")
- private String status;
+ @Excel(name = "订单状态" , readConverterExp = "1=待发货,2=待收货,3=待使用,4=已完成,5=已取消,6=已退款,7=售后中,8=已评价")
+ private String orderStatus;
/**
* 订单编号
*/
@Excel(name = "订单编号")
- private String code;
+ private String orderNumber;
/**
* 订单类型
*/
- @Excel(name = "订单类型")
+ @Excel(name = "订单类型", readConverterExp = "1=服务,2=单品")
private String orderType;
+
+ /**
+ * 配送方式
+ */
+ @Excel(name = "配送方式", readConverterExp = "1=快递,2=自提")
+ private String distributionMode;
+
+ /**
+ * 收货地址
+ */
+ @Excel(name = "收货地址")
+ private String address;
/**
* 下单时间
@@ -56,13 +68,19 @@
* 商品售价
*/
@Excel(name = "商品售价")
- private BigDecimal goodsPrice;
+ private BigDecimal sellingPrice;
/**
* 成本价
*/
- @Excel(name = "成本价")
- private BigDecimal costPrice;
+ @Excel(name = "公司运营成本")
+ private BigDecimal companyCostPrice;
+
+ /**
+ * 成本价
+ */
+ @Excel(name = "门店、供应商成本")
+ private BigDecimal supplierCostPrice;
/**
* 支付金额
@@ -109,4 +127,6 @@
*/
@Excel(name = "市区划代码")
private String cityCode;
+
+ private String addressJson;
}
--
Gitblit v1.7.1