From bd6229ebd9cb543a22944ecb1142fad92b675dce Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 13 十月 2025 14:26:25 +0800
Subject: [PATCH] bug 修复
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 87 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 78 insertions(+), 9 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 15ba306..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
@@ -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;
@@ -56,9 +57,11 @@
private Integer type;
@ApiModelProperty(value = "寮�濮嬫椂闂� yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "缁撴潫鏃堕棿 yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
@ApiModelProperty(value = "鍦扮偣淇℃伅/鐢ㄨ溅璧风偣/鐢ㄩ鍦扮偣")
@@ -88,26 +91,36 @@
@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 = "锛堝彂鍗曟柟璁剧疆锛夎浠锋暟閲�1((閲嶉噺/浜烘暟/锛堝ぉ鏁�/灏忔椂/閲嶉噺锛�/锛堝ぉ鏁�/娆℃暟锛�/鐢ㄩ澶╂暟)", example = "1")
+ private Integer originPriceNum1;
+
+ @ApiModelProperty(value = "锛堝彂鍗曟柟璁剧疆锛夎浠锋暟閲�2(鍒嗘嫞宸�/鍖呰宸� 浜烘暟)", example = "1")
+ private Integer originPriceNum2;
@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 confirmOtherFee;
+ @ApiModelProperty(value = "鎺ュ崟鏂圭‘璁よ垂鐢ㄥ娉�", example = "1")
+ private String confirmFeeRemark;
+ @ApiModelProperty(value = "(鍙戝崟鏂硅缃級棰勪及璐圭敤", example = "1")
+ private Long originEstimatedAccount;
@ApiModelProperty(value = "瀹為檯鏀粯璐圭敤", example = "1")
private Long payAccount;
-
@ApiModelProperty(value = "瀹炴敹璐圭敤", example = "1")
private Long receiveAccount;
@@ -140,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")
@@ -193,7 +206,7 @@
private Integer isUpdate;
@ApiModelProperty(value = "淇敼鏃堕棿", example = "1")
- private Integer isUpdateTime;
+ private Date isUpdateTime;
@ApiModelProperty(value = "鎺ュ崟鏂归粦鍚嶅崟member:id 澶氫釜浠�,鍒嗗壊")
private String blackReceive;
@@ -220,6 +233,12 @@
@ApiModelProperty(value = "杞﹁締瑙勬牸", example = "1")
private String carUnit;
+ @ApiModelProperty(value = "涓夋柟鏀粯璁㈠崟鍙�", example = "1")
+ private String outTradeNo;
+
+ @ApiModelProperty(value = "鎺ュ崟鏂圭‘璁ら噾棰濇椂闂�")
+ private Date confirmFeeTime;
+
@ApiModelProperty(value = "鍥剧墖")
@TableField(exist = false)
private List<Multifile> multifileList;
@@ -242,13 +261,22 @@
@TableField(exist = false)
private List<CateringDTO> cateringDTOList;
- @ApiModelProperty(value = "绉诲姩绔敤鎴�", hidden = true)
+ @ApiModelProperty(value = "绉诲姩绔敤鎴�")
@TableField(exist = false)
private Member member;
@ApiModelProperty(value = "鏌ヨ鎴戠殑璁㈠崟锛�0=鍙戝崟鏂硅鍗曪紱1=鎺ュ崟鏂硅鍗曪紱2=鎺ュ崟澶у巺锛�", example = "1")
@TableField(exist = false)
private Integer queryMyOrderType;
+
+ @Schema(description ="淇敼纭鍊掕鏃�")
+ @TableField(exist = false)
+ private Long confirmCountdown;
+
+
+ @Schema(description ="鑷姩鍙栨秷鍊掕鏃�")
+ @TableField(exist = false)
+ private Long cancelCountdown;
@ApiModelProperty(value = "闇�姹傜被鍨�")
@@ -329,5 +357,46 @@
@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;
+
+
+ @ApiModelProperty(value = "鏄惁鍙紑濮嬶細0=涓嶅彲浠ワ紱1=鍙互", example = "1")
+ @TableField(exist = false)
+ private Integer canStart;
+
}
--
Gitblit v1.9.3