From 2ed6444f45d227e2acc6de65c3e8b582440fb83a Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 06 三月 2025 09:20:40 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java | 20 +++++++++++++-------
1 files changed, 13 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..6c05972 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,19 +11,19 @@
/**
* 订单状态
*/
- @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;
/**
@@ -56,13 +56,19 @@
* 商品售价
*/
@Excel(name = "商品售价")
- private BigDecimal goodsPrice;
+ private BigDecimal sellingPrice;
/**
* 成本价
*/
- @Excel(name = "成本价")
- private BigDecimal costPrice;
+ @Excel(name = "公司运营成本")
+ private BigDecimal companyCostPrice;
+
+ /**
+ * 成本价
+ */
+ @Excel(name = "门店、供应商成本")
+ private BigDecimal supplierCostPrice;
/**
* 支付金额
--
Gitblit v1.7.1