From 99e92a155a1b21a8386b482e7aab6fef649aeffa Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 28 八月 2025 17:47:03 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 8 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 50289c1..7f9156c 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
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
@@ -90,26 +91,23 @@
@ApiModelProperty(value = "鐢ㄥ伐绫诲瀷:0=閲囨憳宸ワ紱1=鍒嗘嫞宸ワ紱2=鍖呰宸ワ紱锛堢敤宸ヨ鍗曪級", example = "1")
private Integer workType;
- @ApiModelProperty(value = "璁′环鏁伴噺1(澶╂暟/鐢ㄨ溅娆℃暟/灏忔椂/鏂ゆ暟)", example = "1")
+ @ApiModelProperty(value = "璁′环鏁伴噺1((閲嶉噺/浜烘暟/锛堝ぉ鏁�/灏忔椂/閲嶉噺锛�/锛堝ぉ鏁�/娆℃暟锛�/鐢ㄩ澶╂暟)", example = "1")
private Integer priceNum1;
- @ApiModelProperty(value = "璁′环鏁伴噺2(浜烘暟/鐢ㄩ浠芥暟)", example = "1")
+ @ApiModelProperty(value = "璁′环鏁伴噺2(鍒嗘嫞宸�/鍖呰宸� 浜烘暟)", example = "1")
private Integer priceNum2;
@ApiModelProperty(value = "闇�姹傝ˉ鍏�")
private String supplement;
@ApiModelProperty(value = "璐圭敤鏍囧噯", example = "1")
- private Long price;
-
+ private BigDecimal price;
@ApiModelProperty(value = "棰勪及璐圭敤", example = "1")
private Long estimatedAccount;
-
@ApiModelProperty(value = "瀹為檯鏀粯璐圭敤", example = "1")
private Long payAccount;
-
@ApiModelProperty(value = "瀹炴敹璐圭敤", example = "1")
private Long receiveAccount;
@@ -195,7 +193,7 @@
private Integer isUpdate;
@ApiModelProperty(value = "淇敼鏃堕棿", example = "1")
- private Integer isUpdateTime;
+ private Date isUpdateTime;
@ApiModelProperty(value = "鎺ュ崟鏂归粦鍚嶅崟member:id 澶氫釜浠�,鍒嗗壊")
private String blackReceive;
@@ -222,6 +220,9 @@
@ApiModelProperty(value = "杞﹁締瑙勬牸", example = "1")
private String carUnit;
+ @ApiModelProperty(value = "涓夋柟鏀粯璁㈠崟鍙�", example = "1")
+ private String outTradeNo;
+
@ApiModelProperty(value = "鍥剧墖")
@TableField(exist = false)
private List<Multifile> multifileList;
@@ -244,7 +245,7 @@
@TableField(exist = false)
private List<CateringDTO> cateringDTOList;
- @ApiModelProperty(value = "绉诲姩绔敤鎴�", hidden = true)
+ @ApiModelProperty(value = "绉诲姩绔敤鎴�")
@TableField(exist = false)
private Member member;
@@ -252,6 +253,9 @@
@TableField(exist = false)
private Integer queryMyOrderType;
+ @Schema(description ="淇敼纭鍊掕鏃�")
+ @TableField(exist = false)
+ private Long confirmCountdown;
@ApiModelProperty(value = "闇�姹傜被鍨�")
@TableField(exist = false)
@@ -331,5 +335,41 @@
@TableField(exist = false)
private Date doneTimeEnd;
+ @ApiModelProperty(value = "鎺掑簭鏂瑰紡锛�0=鏈�鏂板彂甯�;1=璺濈浼樺厛;2=浠锋牸鍊掑簭", example = "1")
+ @TableField(exist = false)
+ private Integer sortType;
+
+ @ApiModelProperty(value = "鎺ュ崟鏂硅瘎鍒�")
+ @TableField(exist = false)
+ private double score;
+
+ @ApiModelProperty(value = "鎺ュ崟閲�")
+ @TableField(exist = false)
+ private Long receiveNum;
+
+ @ApiModelProperty(value = "鍙戝崟閲�")
+ @TableField(exist = false)
+ private Long publishNum;
+
+ @ApiModelProperty(value = "鍙戝崟鏂瑰ご鍍�")
+ @TableField(exist = false)
+ private String releaseCoverImage;
+
+ @ApiModelProperty(value = "鎺ュ崟鏂瑰ご鍍�")
+ @TableField(exist = false)
+ private String acceptCoverImage;
+
+ @ApiModelProperty(value = "缁忓害", example = "1")
+ @TableField(exist = false)
+ private BigDecimal queryLat;
+
+ @ApiModelProperty(value = "绾害", example = "1")
+ @TableField(exist = false)
+ private BigDecimal queryLgt;
+
+ @ApiModelProperty(value = "鏄惁鍙彇娑堬細0=鍙互锛�1=涓嶅彲浠�", example = "1")
+ @TableField(exist = false)
+ private Integer cancelStatus;
+
}
--
Gitblit v1.9.3