From 9a43e21c30a5d2db9c29f4ae23df9b39fc858a8a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 11:21:36 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 93 +++++++++++++++++++++++++++++++++-------------
1 files changed, 67 insertions(+), 26 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 fd7fd2a..384a0f5 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
@@ -1,6 +1,9 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.dto.CateringDTO;
+import com.doumee.dao.dto.WayInfoDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,6 +13,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 璁㈠崟淇℃伅璁板綍
@@ -27,7 +31,7 @@
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
- private Byte deleted;
+ private Integer deleted;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
@@ -35,7 +39,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -44,7 +47,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
@@ -61,12 +63,10 @@
@ApiModelProperty(value = "寮�濮嬫椂闂� yyyy-MM-dd")
@ExcelColumn(name="寮�濮嬫椂闂� yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "缁撴潫鏃堕棿 yyyy-MM-dd")
@ExcelColumn(name="缁撴潫鏃堕棿 yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
@ApiModelProperty(value = "鍦扮偣淇℃伅/鐢ㄨ溅璧风偣/鐢ㄩ鍦扮偣")
@@ -105,12 +105,12 @@
@ExcelColumn(name="鐢ㄥ伐绫诲瀷:0=閲囨憳宸ワ紱1=鍒嗘嫞宸ワ紱2=鍖呰宸ワ紱锛堢敤宸ヨ鍗曪級")
private Integer workType;
- @ApiModelProperty(value = "璁′环鏁伴噺1(澶╂暟/鐢ㄨ溅娆℃暟)", example = "1")
- @ExcelColumn(name="璁′环鏁伴噺1(澶╂暟/鐢ㄨ溅娆℃暟)")
+ @ApiModelProperty(value = "璁′环鏁伴噺1(澶╂暟/鐢ㄨ溅娆℃暟/灏忔椂/鏂ゆ暟)", example = "1")
+ @ExcelColumn(name="璁′环鏁伴噺1(澶╂暟/鐢ㄨ溅娆℃暟/灏忔椂/鏂ゆ暟)")
private Integer priceNum1;
- @ApiModelProperty(value = "璁′环鏁伴噺2(鐢ㄥ伐鏁伴噺/閲囨憳鏁伴噺/鐢ㄨ溅鏁伴噺/)", example = "1")
- @ExcelColumn(name="璁′环鏁伴噺2(鐢ㄥ伐鏁伴噺/閲囨憳鏁伴噺/鐢ㄨ溅鏁伴噺/)")
+ @ApiModelProperty(value = "璁′环鏁伴噺2(浜烘暟/鐢ㄩ浠芥暟)", example = "1")
+ @ExcelColumn(name="璁′环鏁伴噺2(浜烘暟/鐢ㄩ浠芥暟)")
private Integer priceNum2;
@ApiModelProperty(value = "闇�姹傝ˉ鍏�")
@@ -131,14 +131,13 @@
@ApiModelProperty(value = "瀹炴敹璐圭敤", example = "1")
@ExcelColumn(name="瀹炴敹璐圭敤")
- private Long reviceAccount;
+ private Long receiveAccount;
- @ApiModelProperty(value = "璐圭敤璇存槑")
- @ExcelColumn(name="璐圭敤璇存槑")
- private String priceRemark;
+// @ApiModelProperty(value = "璐圭敤璇存槑(寮冪敤)")
+// private String priceRemark;
- @ApiModelProperty(value = "鐢ㄨ溅绫诲瀷(杩愯揣浣跨敤):0=澶╋紱1=娆�", example = "1")
- @ExcelColumn(name="鐢ㄨ溅绫诲瀷(杩愯揣浣跨敤):0=澶╋紱1=娆�")
+ @ApiModelProperty(value = "鐢ㄨ溅绫诲瀷(鐢ㄥ伐鍖呰/杩愯揣浣跨敤):0=澶�;1=娆�/灏忔椂;2=閲嶉噺", example = "1")
+ @ExcelColumn(name="鐢ㄨ溅绫诲瀷(鐢ㄥ伐鍖呰/杩愯揣浣跨敤):0=澶�;1=娆�/灏忔椂;2=閲嶉噺")
private Integer carType;
@ApiModelProperty(value = "杩愯緭鍝佺(杩愯揣浣跨敤) 鍏宠仈category琛�", example = "1")
@@ -154,7 +153,7 @@
private String transportUnit;
@ApiModelProperty(value = "鐢ㄨ溅缁堢偣鍦板潃")
- @ExcelColumn(name="鐢ㄨ溅缁堢偣鍦板潃")
+ @ExcelColumn(name = "鐢ㄨ溅缁堢偣鍦板潃")
private String locationEnd;
@ApiModelProperty(value = "鐢ㄨ溅缁堢偣缁忓害")
@@ -173,13 +172,16 @@
@ExcelColumn(name="璁㈠崟缂栧彿")
private String code;
- @ApiModelProperty(value = "璁㈠崟鐘舵��:0=寰呮帴鍗曪紱1=宸叉帴鍗曪紱2=杩涜涓紱3=宸插畬鎴愶紱99=宸插彇娑堬紱", example = "1")
- @ExcelColumn(name="璁㈠崟鐘舵��:0=寰呮帴鍗曪紱1=宸叉帴鍗曪紱2=杩涜涓紱3=宸插畬鎴愶紱99=宸插彇娑堬紱")
+ @ApiModelProperty(value = "璁㈠崟鐘舵��:0=寰呮敮浠� 1=寰呮帴鍗曪紱2=宸叉帴鍗曪紱3=杩涜涓紱4=宸插畬鎴愶紱99=宸插彇娑堬紱", example = "1")
+ @ExcelColumn(name="璁㈠崟鐘舵��:0=寰呮敮浠� 1=寰呮帴鍗曪紱2=宸叉帴鍗曪紱3=杩涜涓紱4=宸插畬鎴愶紱99=宸插彇娑堬紱")
private Integer status;
+
+ @ApiModelProperty(value = "鏀粯鐘舵��:0=寰呮敮浠� 1=宸叉敮浠�", example = "1")
+ @ExcelColumn(name="鏀粯鐘舵��:0=寰呮敮浠� 1=宸叉敮浠橈紱")
+ private Integer payStatus;
@ApiModelProperty(value = "鎺ュ崟鏃堕棿")
@ExcelColumn(name="鎺ュ崟鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date acceptTime;
@ApiModelProperty(value = "鎺ュ崟浜�", example = "1")
@@ -192,12 +194,10 @@
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
@ExcelColumn(name="寮�濮嬩綔涓氭椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date workStartTime;
@ApiModelProperty(value = "瀹屾垚鏃堕棿")
@ExcelColumn(name="瀹屾垚鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date finishTime;
@ApiModelProperty(value = "骞冲彴鎻愭垚姣斾緥", example = "1")
@@ -222,7 +222,6 @@
@ApiModelProperty(value = "璇勪环鏃堕棿")
@ExcelColumn(name="璇勪环鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date commentTime;
@ApiModelProperty(value = "璇勪环绫诲瀷:0=鎵嬪姩璇勪环锛�1=绯荤粺鑷姩璇勪环锛�", example = "1")
@@ -231,15 +230,57 @@
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
@ExcelColumn(name="鍙栨秷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date cancelTime;
- @ApiModelProperty(value = "鏄惁宸蹭慨鏀�:0=鍚︼紱1=鏄紱", example = "1")
- @ExcelColumn(name="鏄惁宸蹭慨鏀�:0=鍚︼紱1=鏄紱")
+ @ApiModelProperty(value = "鏄惁宸蹭慨鏀�:0=鍚︼紱1=鏄紱2=宸茬‘璁�;", example = "1")
+ @ExcelColumn(name="鏄惁宸蹭慨鏀�:0=鍚︼紱1=鏄紱2=宸茬‘璁わ紱")
private Integer isUpdate;
@ApiModelProperty(value = "鎺ュ崟鏂归粦鍚嶅崟member:id 澶氫釜浠�,鍒嗗壊")
@ExcelColumn(name="鎺ュ崟鏂归粦鍚嶅崟member:id 澶氫釜浠�,鍒嗗壊")
- private String blackRecive;
+ private String blackReceive;
+
+
+ @ApiModelProperty(value = "鎬诲ぉ鏁�", example = "1")
+ @ExcelColumn(name="鎬诲ぉ鏁�")
+ private Integer totalDays;
+
+ @ApiModelProperty(value = "鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�", example = "1")
+ @ExcelColumn(name = "鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�")
+ private Integer cancelType;
+
+ @ApiModelProperty(value = "鍥剧墖")
+ @TableField(exist = false)
+ private List<Multifile> multifileList;
+
+ @ApiModelProperty(value = "閫旂粡鐐�")
+ @TableField(exist = false)
+ private List<WayInfoDTO> wayInfoDTOList;
+
+ @ApiModelProperty(value = "椁愭爣")
+ @TableField(exist = false)
+ private List<CateringDTO> cateringDTOList;
+
+ @ApiModelProperty(value = "绉诲姩绔敤鎴�", hidden = true)
+ @TableField(exist = false)
+ private Member member;
+
+ @ApiModelProperty(value = "鏌ヨ鎴戠殑璁㈠崟锛�0=鍙戝崟鏂硅鍗曪紱1=鎺ュ崟鏂硅鍗曪紱2=鎺ュ崟澶у巺锛�", example = "1")
+ @TableField(exist = false)
+ private Integer queryMyOrderType;
+
+
+ @ApiModelProperty(value = "闇�姹傜被鍨�")
+ @TableField(exist = false)
+ private String categoryName;
+
+ @ApiModelProperty(value = "杩愯緭鍝佺")
+ @TableField(exist = false)
+ private String transportTypeName;
+
+ @ApiModelProperty(value = "璺濈 鍗曚綅km")
+ @TableField(exist = false)
+ private double distance;
}
+
--
Gitblit v1.9.3