From c51de64d5ee334d914c90f5e4f82a13f159492ca Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 23 四月 2026 20:08:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/vo/MyOrderDetailVO.java | 18 +++++++++---------
1 files changed, 9 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..344432b 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;
@@ -122,6 +123,9 @@
@ApiModelProperty(value = "淇濅环淇濊垂锛堝垎锛�")
private Long declaredFee;
+ @ApiModelProperty(value = "鏄惁鍔犳�ワ細0=鍚︼紱1=鏄�")
+ private Integer isUrgent;
+
@ApiModelProperty(value = "鍔犳�ヨ垂鐢紙鍒嗭級")
private Long urgentAmount;
@@ -129,6 +133,9 @@
private Long actualPayAmount;
// ---- 閫炬湡 ----
+
+ @ApiModelProperty(value = "閫炬湡鐘舵��: 0=鏃犻�炬湡 1=瀛樺湪閫炬湡 2=寰呮敮浠橀�炬湡 3=閫炬湡宸叉敮浠�")
+ private Integer overdueStatus;
@ApiModelProperty(value = "鏄惁閫炬湡")
private Boolean overdue;
@@ -141,19 +148,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;
// ---- 鏍囪 ----
--
Gitblit v1.9.3