From 4ab710d8d70017f090dd9601099ded1a50a58a10 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 四月 2026 22:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/vo/OrderDetailVO.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/vo/OrderDetailVO.java b/server/services/src/main/java/com/doumee/dao/vo/OrderDetailVO.java
index c3ba743..babd1a1 100644
--- a/server/services/src/main/java/com/doumee/dao/vo/OrderDetailVO.java
+++ b/server/services/src/main/java/com/doumee/dao/vo/OrderDetailVO.java
@@ -1,6 +1,7 @@
package com.doumee.dao.vo;
import com.doumee.dao.business.model.Orders;
+import com.doumee.dao.business.model.OrdersRefund;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -59,25 +60,20 @@
private List<String> storeOutImages;
@ApiModelProperty(value = "鐗╁搧鏄庣粏鍒楄〃")
- private List<OrderDetailItemVO> detailList;
+ private List<OrderItemVO> detailList;
- /**
- * 鐗╁搧鏄庣粏椤�
- */
- @Data
- @ApiModel("鐗╁搧鏄庣粏椤�")
- public static class OrderDetailItemVO {
+ @ApiModelProperty(value = "閫�娆捐褰曪紙璁㈠崟鐘舵�佷负鍙栨秷/閫�娆炬椂杩斿洖锛�")
+ private OrdersRefund ordersRefund;
- @ApiModelProperty(value = "灏哄鍚嶇О")
- private String luggageName;
+ @ApiModelProperty(value = "閫�娆惧彇浠跺浘鐗囷紙宸插瓨浠剁敵璇峰彇娑堟椂杩斿洖锛�")
+ private List<String> refundTakeImages;
- @ApiModelProperty(value = "鏁伴噺")
- private Integer num;
+ @ApiModelProperty(value = "骞冲彴鎿嶄綔浜哄悕绉帮紙骞冲彴鐩存帴鍙栨秷鏃惰繑鍥烇級")
+ private String platformUserName;
- @ApiModelProperty(value = "鍗曚环锛堝厓锛�")
- private Double unitPriceYuan;
+ @ApiModelProperty(value = "鎺ュ崟鍙告満濮撳悕")
+ private String driverName;
- @ApiModelProperty(value = "灏忚璐圭敤锛堝厓锛�")
- private Double subtotal;
- }
+ @ApiModelProperty(value = "璁㈠崟鐘舵�佹弿杩�")
+ private String statusDesc;
}
--
Gitblit v1.9.3