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/DriverOrderDetailVO.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/vo/DriverOrderDetailVO.java b/server/services/src/main/java/com/doumee/dao/vo/DriverOrderDetailVO.java
index 0d401f3..556a31f 100644
--- a/server/services/src/main/java/com/doumee/dao/vo/DriverOrderDetailVO.java
+++ b/server/services/src/main/java/com/doumee/dao/vo/DriverOrderDetailVO.java
@@ -47,11 +47,20 @@
@ApiModelProperty(value = "鍙栦欢鍚嶇О锛堥棬搴楀悕绉版垨鑷畾涔夊湴鐐癸級")
private String takeName;
+ @ApiModelProperty(value = "鍙栦欢鍦板潃")
+ private String takeAddress;
+
+ @ApiModelProperty(value = "鍙栦欢闂ㄥ簵涓婚敭锛堟湁鍙栦欢闂ㄥ簵鏃惰繑鍥烇級")
+ private Integer takeShopId;
+
@ApiModelProperty(value = "鍙栦欢璺濈锛堝 500m銆�1.2km锛�")
private String takeDistance;
- @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
- private String contactPhone;
+ @ApiModelProperty(value = "瀛樹欢闂ㄥ簵鐢佃瘽")
+ private String depositShopPhone;
+
+ @ApiModelProperty(value = "鍙栦欢鑱旂郴鐢佃瘽锛堝彇浠堕棬搴楃數璇濇垨鍙栦欢浜烘墜鏈哄彿锛�")
+ private String takeContactPhone;
@ApiModelProperty(value = "鍙告満钖叕锛堝垎锛�")
private Long driverFee;
@@ -59,11 +68,26 @@
@ApiModelProperty(value = "鍔犳�ヨ垂鐢紙鍒嗭級")
private Long urgentAmount;
+ @ApiModelProperty(value = "骞冲彴濂栧姳閲戦锛堝垎锛�")
+ private Long platformRewardAmount;
+
@ApiModelProperty(value = "鐗╁搧鏄庣粏鍒楄〃")
private List<OrderItem> items;
@ApiModelProperty(value = "鏄惁璐甸噸鐗╁搧")
private Boolean isValuable;
+
+ @ApiModelProperty(value = "鐗╁搧绛夌骇鍚嶇О")
+ private String goodLevelName;
+
+ @ApiModelProperty(value = "鐗╁搧绫诲瀷鍚嶇О")
+ private String goodTypeName;
+
+ @ApiModelProperty(value = "鏄惁瀛樺湪鐗瑰ぇ灏哄锛�0=鍚� 1=鏄�")
+ private Integer hasOversized;
+
+ @ApiModelProperty(value = "鍙告満鍙栬揣鐮侊紙寰呭彇璐х姸鎬佹椂杩斿洖锛�")
+ private String driverVerifyCode;
@ApiModelProperty(value = "瀵艰埅绾害锛坰tatus=2瀛樹欢闂ㄥ簵绾害锛宻tatus=3/4鍙栦欢绾害锛�")
private Double navigateLat;
@@ -76,6 +100,27 @@
@ApiModelProperty(value = "涓嬪崟闄勪欢鍥剧墖鍏ㄨ矾寰勫垪琛�")
private List<String> orderImages;
+
+ // ---- 鏃堕棿淇℃伅 ----
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @com.fasterxml.jackson.annotation.JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty(value = "鍙告満鎺ュ崟鏃堕棿")
+ @com.fasterxml.jackson.annotation.JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date acceptTime;
+
+ @ApiModelProperty(value = "鍙告満鍙栦欢鏃堕棿")
+ @com.fasterxml.jackson.annotation.JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date driverTakeTime;
+
+ @ApiModelProperty(value = "璁㈠崟瀹屾垚鏃堕棿")
+ @com.fasterxml.jackson.annotation.JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date finishTime;
+
+ @ApiModelProperty(value = "璁㈠崟澶囨敞")
+ private String remark;
// ---- 瀹炴椂缁忕含搴︼紙寮傚湴瀵勫瓨鎸夌姸鎬佽繑鍥烇級 ----
@@ -123,6 +168,9 @@
@ApiModelProperty(value = "鏁伴噺")
private Integer quantity;
+
+ @ApiModelProperty(value = "鏄惁澶т欢鐗╁搧锛�0=鍚� 1=鏄�")
+ private Integer isOversized;
}
}
--
Gitblit v1.9.3