From c313a253b1fcdc75b6be5db575fc2b29fb407021 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 15 四月 2026 20:05:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/vo/MyOrderVO.java | 94 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 94 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/vo/MyOrderVO.java b/server/services/src/main/java/com/doumee/dao/vo/MyOrderVO.java
new file mode 100644
index 0000000..90d05ca
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/vo/MyOrderVO.java
@@ -0,0 +1,94 @@
+package com.doumee.dao.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 灏忕▼搴忕-鎴戠殑璁㈠崟鍒楄〃椤�
+ * @author rk
+ * @date 2026/04/15
+ */
+@Data
+@ApiModel("鎴戠殑璁㈠崟鍒楄〃椤�")
+public class MyOrderVO {
+
+ @ApiModelProperty(value = "璁㈠崟涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "璁㈠崟缂栧彿")
+ private String code;
+
+ @ApiModelProperty(value = "瀵勫瓨鏂瑰紡:0=灏卞湴瀛樺彇锛�1=寮傚湴瀛樺彇")
+ private Integer type;
+
+ @ApiModelProperty(value = "璁㈠崟鐘舵��")
+ private Integer status;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty(value = "棰勮鍙栦欢鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date expectedTakeTime;
+
+ // ---- 瀛樹欢闂ㄥ簵 ----
+
+ @ApiModelProperty(value = "瀛樹欢闂ㄥ簵鍚嶇О")
+ private String depositShopName;
+
+ @ApiModelProperty(value = "瀛樹欢闂ㄥ簵鑱旂郴浜�")
+ private String depositShopLinkName;
+
+ @ApiModelProperty(value = "瀛樹欢闂ㄥ簵鑱旂郴鐢佃瘽")
+ private String depositShopPhone;
+
+ // ---- 鍙栦欢淇℃伅 ----
+
+ @ApiModelProperty(value = "鍙栦欢闂ㄥ簵鍚嶇О锛堟湁鍙栦欢闂ㄥ簵鏃惰繑鍥烇級")
+ private String takeShopName;
+
+ @ApiModelProperty(value = "鍙栦欢闂ㄥ簵鍦板潃锛堟湁鍙栦欢闂ㄥ簵鏃惰繑鍥烇級")
+ private String takeShopAddress;
+
+ @ApiModelProperty(value = "鍙栦欢鍦扮偣锛堟棤鍙栦欢闂ㄥ簵鏃惰繑鍥烇紝鐢ㄦ埛鑷�夛級")
+ private String takeLocation;
+
+ @ApiModelProperty(value = "鍙栦欢鍦扮偣璇︾粏鍦板潃锛堟棤鍙栦欢闂ㄥ簵鏃惰繑鍥烇級")
+ private String takeLocationRemark;
+
+ @ApiModelProperty(value = "鍙栦欢浜哄悕绉�")
+ private String takeUser;
+
+ @ApiModelProperty(value = "鍙栦欢浜烘墜鏈哄彿")
+ private String takePhone;
+
+ // ---- 璐圭敤 ----
+
+ @ApiModelProperty(value = "鎶ヤ环淇濊垂锛堝垎锛�")
+ private Long declaredFee;
+
+ @ApiModelProperty(value = "棰勪及璐圭敤锛堝垎锛�")
+ private Long estimatedAmount;
+
+ // ---- 閫炬湡 ----
+
+ @ApiModelProperty(value = "鏄惁閫炬湡")
+ private Boolean overdue;
+
+ @ApiModelProperty(value = "閫炬湡澶╂暟")
+ private Integer overdueDays;
+
+ @ApiModelProperty(value = "閫炬湡璐圭敤锛堝垎锛�")
+ private Long overdueFee;
+
+ // ---- 鐗╁搧鏄庣粏 ----
+
+ @ApiModelProperty(value = "鐗╁搧鏄庣粏鍒楄〃")
+ private List<OrderItemVO> detailList;
+}
--
Gitblit v1.9.3