From 59bfd0b8bbbf0ee94ec68e4a3a1a6e536d0ad8fd Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 20 五月 2026 23:10:43 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/dao/vo/MyOrderDetailVO.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/vo/MyOrderDetailVO.java b/server/services/src/main/java/com/doumee/dao/vo/MyOrderDetailVO.java
index 0ff7adb..b66b8c1 100644
--- a/server/services/src/main/java/com/doumee/dao/vo/MyOrderDetailVO.java
+++ b/server/services/src/main/java/com/doumee/dao/vo/MyOrderDetailVO.java
@@ -1,5 +1,6 @@
package com.doumee.dao.vo;
+import com.doumee.dao.business.model.OrdersRefund;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -75,6 +76,8 @@
private Date arriveTime;
// ---- 瀛樹欢闂ㄥ簵 ----
+ @ApiModelProperty(value = "瀛樹欢闂ㄥ簵涓婚敭", example = "1")
+ private Integer depositShopId;
@ApiModelProperty(value = "瀛樹欢闂ㄥ簵鍚嶇О")
private String depositShopName;
@@ -122,13 +125,23 @@
@ApiModelProperty(value = "淇濅环淇濊垂锛堝垎锛�")
private Long declaredFee;
+ @ApiModelProperty(value = "鏄惁鍔犳�ワ細0=鍚︼紱1=鏄�")
+ private Integer isUrgent;
+
@ApiModelProperty(value = "鍔犳�ヨ垂鐢紙鍒嗭級")
private Long urgentAmount;
@ApiModelProperty(value = "瀹為檯鏀粯璐圭敤锛堝垎锛�")
private Long actualPayAmount;
+ @ApiModelProperty(value = "浼樻儬鍒告姷鎵ｉ噾棰濓紙鍒嗭級")
+ private Long deductionAmount;
+
// ---- 閫炬湡 ----
+
+ //閫炬湡鐘舵��: 0=鏈埌搴楁湭閫炬湡 1=鏈埌搴楀瓨鍦ㄩ�炬湡 2=宸插埌搴楁湭瀛樺湪閫炬湡 3=宸插埌搴楀緟鏀粯閫炬湡 4=閫炬湡宸叉敮浠�
+ @ApiModelProperty(value = "閫炬湡鐘舵��: 0=鏈埌搴楁湭閫炬湡 1=鏈埌搴楀瓨鍦ㄩ�炬湡 2=宸插埌搴楁湭閫炬湡 3=宸插埌搴楀緟鏀粯閫炬湡 4=閫炬湡宸叉敮浠�")
+ private Integer overdueStatus;
@ApiModelProperty(value = "鏄惁閫炬湡")
private Boolean overdue;
@@ -141,19 +154,12 @@
// ---- 閫�娆撅紙status=96/99 鏃惰繑鍥烇級 ----
- @ApiModelProperty(value = "閫�娆鹃噾棰濓紙鍒嗭級")
- private Long refundAmount;
-
@ApiModelProperty(value = "閫�娆剧敵璇锋椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date refundApplyTime;
- @ApiModelProperty(value = "閫�娆炬椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date refundTime;
-
- @ApiModelProperty(value = "閫�娆惧娉�")
- private String refundRemark;
+ @ApiModelProperty(value = "閫�娆捐褰�")
+ private OrdersRefund refundInfo;
// ---- 鏍囪 ----
@@ -228,4 +234,9 @@
@ApiModelProperty(value = "鍙告満璇勫垎")
private Integer driverScore;
+
+ @ApiModelProperty(value = "搴忓彿")
+ private String sortnum;
+ @ApiModelProperty(value = "鍙栬揣搴忓彿")
+ private String sortnumTake;
}
--
Gitblit v1.9.3