From 82735e4d46ac7b9969facef2acc8f8e793b68f71 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 15 九月 2025 16:11:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
index 206604b..d0d91e4 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java
@@ -153,8 +153,8 @@
@ExcelColumn(name = "璁㈠崟缂栧彿",index = 1,width = 10)
private String code;
- @ApiModelProperty(value = "璁㈠崟鐘舵��:0=寰呮敮浠� 1=寰呮帴鍗曪紱2=宸叉帴鍗曪紱3=杩涜涓紱4=宸插畬鎴愶紱99=宸插彇娑堬紱", example = "1")
- @ExcelColumn(name = "璁㈠崟鐘舵��",index = 11,width = 10,valueMapping = "0=寰呮敮浠�;1=寰呮帴鍗�;2=宸叉帴鍗�;3=杩涜涓�;4=宸插畬鎴�;99=宸插彇娑�;")
+ @ApiModelProperty(value = "璁㈠崟鐘舵��:0=寰呮敮浠� 1=寰呮帴鍗曪紱2=宸叉帴鍗曪紱3=杩涜涓紱4=宸插畬鎴愶紱5=宸茬‘璁ら噾棰濓紱99=宸插彇娑堬紱", example = "1")
+ @ExcelColumn(name = "璁㈠崟鐘舵��",index = 11,width = 10,valueMapping = "0=寰呮敮浠�;1=寰呮帴鍗�;2=宸叉帴鍗�;3=杩涜涓�;4=宸插畬鎴�;5=寰呮敮浠�;99=宸插彇娑�;")
private Integer status;
@ApiModelProperty(value = "鏀粯鐘舵��:0=寰呮敮浠� 1=宸叉敮浠�", example = "1")
@@ -236,6 +236,9 @@
@ApiModelProperty(value = "涓夋柟鏀粯璁㈠崟鍙�", example = "1")
private String outTradeNo;
+ @ApiModelProperty(value = "鎺ュ崟鏂圭‘璁ら噾棰濇椂闂�")
+ private Date confirmFeeTime;
+
@ApiModelProperty(value = "鍥剧墖")
@TableField(exist = false)
private List<Multifile> multifileList;
@@ -269,6 +272,12 @@
@Schema(description ="淇敼纭鍊掕鏃�")
@TableField(exist = false)
private Long confirmCountdown;
+
+
+ @Schema(description ="鑷姩鍙栨秷鍊掕鏃�")
+ @TableField(exist = false)
+ private Long cancelCountdown;
+
@ApiModelProperty(value = "闇�姹傜被鍨�")
@TableField(exist = false)
@@ -384,5 +393,10 @@
@TableField(exist = false)
private Integer cancelStatus;
+
+ @ApiModelProperty(value = "鏄惁鍙紑濮嬶細0=涓嶅彲浠ワ紱1=鍙互", example = "1")
+ @TableField(exist = false)
+ private Integer canStart;
+
}
--
Gitblit v1.9.3