From 278da88f21bff29eef96a2e439ac35eb444630fe Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 八月 2025 10:27:23 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 261 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 191 insertions(+), 70 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 a47edc6..197b04e 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
@@ -2,6 +2,8 @@
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;
@@ -23,229 +25,348 @@
@TableName("`orders`")
public class Orders {
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
- private Byte deleted;
+ private Integer deleted;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name = "鍙戝竷鏃堕棿",index = 8,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer updateUser;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鍙戝崟鏂�", example = "1")
- @ExcelColumn(name="鍙戝崟鏂�")
private Integer releaseMemberId;
@ApiModelProperty(value = "绫诲瀷:0=鐢ㄥ伐锛�1=杩愯揣锛�2=璁㈤", example = "1")
- @ExcelColumn(name="绫诲瀷:0=鐢ㄥ伐锛�1=杩愯揣锛�2=璁㈤")
+ @ExcelColumn(name = "璁㈠崟绫诲瀷",valueMapping = "0=鐢ㄥ伐鍗�;1=璐ц繍鍗�;2=璁㈤鍗�;",index = 2,width = 10)
private Integer type;
@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 = "鍦扮偣淇℃伅/鐢ㄨ溅璧风偣/鐢ㄩ鍦扮偣")
- @ExcelColumn(name="鍦扮偣淇℃伅/鐢ㄨ溅璧风偣/鐢ㄩ鍦扮偣")
private String location;
@ApiModelProperty(value = "鍦扮偣鎻忚堪")
- @ExcelColumn(name="鍦扮偣鎻忚堪")
private String locationRemark;
@ApiModelProperty(value = "缁忓害", example = "1")
- @ExcelColumn(name="缁忓害")
private BigDecimal lat;
@ApiModelProperty(value = "鐪佷唤")
- @ExcelColumn(name="鐪佷唤")
private String province;
@ApiModelProperty(value = "鍩庡競")
- @ExcelColumn(name="鍩庡競")
private String city;
@ApiModelProperty(value = "鍖哄幙")
- @ExcelColumn(name="鍖哄幙")
private String area;
@ApiModelProperty(value = "绾害", example = "1")
- @ExcelColumn(name="绾害")
private BigDecimal lgt;
@ApiModelProperty(value = "闇�姹傜被鍨嬶紙杩愯揣/鐢ㄥ伐)锛氬叧鑱� category", example = "1")
- @ExcelColumn(name="闇�姹傜被鍨嬶紙杩愯揣/鐢ㄥ伐)锛氬叧鑱� category")
private Integer categoryId;
@ApiModelProperty(value = "鐢ㄥ伐绫诲瀷:0=閲囨憳宸ワ紱1=鍒嗘嫞宸ワ紱2=鍖呰宸ワ紱锛堢敤宸ヨ鍗曪級", example = "1")
- @ExcelColumn(name="鐢ㄥ伐绫诲瀷:0=閲囨憳宸ワ紱1=鍒嗘嫞宸ワ紱2=鍖呰宸ワ紱锛堢敤宸ヨ鍗曪級")
private Integer workType;
- @ApiModelProperty(value = "璁′环鏁伴噺1(澶╂暟/鐢ㄨ溅娆℃暟)", example = "1")
- @ExcelColumn(name="璁′环鏁伴噺1(澶╂暟/鐢ㄨ溅娆℃暟)")
+ @ApiModelProperty(value = "璁′环鏁伴噺1((閲嶉噺/浜烘暟/锛堝ぉ鏁�/灏忔椂/閲嶉噺锛�/锛堝ぉ鏁�/娆℃暟锛�/鐢ㄩ澶╂暟)", example = "1")
private Integer priceNum1;
- @ApiModelProperty(value = "璁′环鏁伴噺2(鐢ㄥ伐鏁伴噺/閲囨憳鏁伴噺/鐢ㄨ溅鏁伴噺/)", example = "1")
- @ExcelColumn(name="璁′环鏁伴噺2(鐢ㄥ伐鏁伴噺/閲囨憳鏁伴噺/鐢ㄨ溅鏁伴噺/)")
+ @ApiModelProperty(value = "璁′环鏁伴噺2(鍒嗘嫞宸�/鍖呰宸� 浜烘暟)", example = "1")
private Integer priceNum2;
@ApiModelProperty(value = "闇�姹傝ˉ鍏�")
- @ExcelColumn(name="闇�姹傝ˉ鍏�")
private String supplement;
@ApiModelProperty(value = "璐圭敤鏍囧噯", example = "1")
- @ExcelColumn(name="璐圭敤鏍囧噯")
private Long price;
@ApiModelProperty(value = "棰勪及璐圭敤", example = "1")
- @ExcelColumn(name="棰勪及璐圭敤")
private Long estimatedAccount;
@ApiModelProperty(value = "瀹為檯鏀粯璐圭敤", example = "1")
- @ExcelColumn(name="瀹為檯鏀粯璐圭敤")
private Long payAccount;
+
@ApiModelProperty(value = "瀹炴敹璐圭敤", example = "1")
- @ExcelColumn(name="瀹炴敹璐圭敤")
private Long receiveAccount;
- @ApiModelProperty(value = "璐圭敤璇存槑")
- @ExcelColumn(name="璐圭敤璇存槑")
- private String priceRemark;
-
- @ApiModelProperty(value = "鐢ㄨ溅绫诲瀷(杩愯揣浣跨敤):0=澶╋紱1=娆�", example = "1")
- @ExcelColumn(name="鐢ㄨ溅绫诲瀷(杩愯揣浣跨敤):0=澶╋紱1=娆�")
+ @ApiModelProperty(value = "鐢ㄨ溅绫诲瀷(鐢ㄥ伐鍖呰/杩愯揣浣跨敤):0=澶�;1=娆�/灏忔椂;2=閲嶉噺", example = "1")
private Integer carType;
@ApiModelProperty(value = "杩愯緭鍝佺(杩愯揣浣跨敤) 鍏宠仈category琛�", example = "1")
- @ExcelColumn(name="杩愯緭鍝佺(杩愯揣浣跨敤) 鍏宠仈category琛�")
private Integer transportTypeId;
@ApiModelProperty(value = "杩愯緭閲嶉噺/鏁伴噺", example = "1")
- @ExcelColumn(name="杩愯緭閲嶉噺/鏁伴噺")
private Integer transportNum;
@ApiModelProperty(value = "杩愯緭鍗曚綅(涓�/鏂�)")
- @ExcelColumn(name="杩愯緭鍗曚綅(涓�/鏂�)")
private String transportUnit;
@ApiModelProperty(value = "鐢ㄨ溅缁堢偣鍦板潃")
- @ExcelColumn(name="鐢ㄨ溅缁堢偣鍦板潃")
private String locationEnd;
@ApiModelProperty(value = "鐢ㄨ溅缁堢偣缁忓害")
- @ExcelColumn(name="鐢ㄨ溅缁堢偣缁忓害")
private String latEnd;
@ApiModelProperty(value = "鐢ㄨ溅缁堢偣绾害")
- @ExcelColumn(name="鐢ㄨ溅缁堢偣绾害")
private String lgtEnd;
@ApiModelProperty(value = "閫旂粡鐐�/椁愭爣淇℃伅")
- @ExcelColumn(name="閫旂粡鐐�/椁愭爣淇℃伅")
private String wayInfo;
@ApiModelProperty(value = "璁㈠崟缂栧彿")
- @ExcelColumn(name="璁㈠崟缂栧彿")
+ @ExcelColumn(name = "璁㈠崟缂栧彿",index = 1,width = 10)
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 = "璁㈠崟鐘舵��",index = 11,width = 10,valueMapping = "0=寰呮敮浠�;1=寰呮帴鍗�;2=宸叉帴鍗�;3=杩涜涓�;4=宸插畬鎴�;99=宸插彇娑�;")
private Integer status;
+ @ApiModelProperty(value = "鏀粯鐘舵��:0=寰呮敮浠� 1=宸叉敮浠�", example = "1")
+ private Integer payStatus;
+
@ApiModelProperty(value = "鎺ュ崟鏃堕棿")
- @ExcelColumn(name="鎺ュ崟鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name = "鎺ュ崟鏃堕棿",index = 9,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date acceptTime;
@ApiModelProperty(value = "鎺ュ崟浜�", example = "1")
- @ExcelColumn(name="鎺ュ崟浜�")
private Integer acceptMemberId;
@ApiModelProperty(value = "鎺ュ崟绫诲瀷:0=鎵嬪姩鎺ュ崟锛�1=绯荤粺娲惧崟锛�", example = "1")
- @ExcelColumn(name="鎺ュ崟绫诲瀷:0=鎵嬪姩鎺ュ崟锛�1=绯荤粺娲惧崟锛�")
+ @ExcelColumn(name = "鎺ュ崟鏂瑰紡",index = 14,width = 10,valueMapping = "0=鎵嬪姩鎺ュ崟;1=绯荤粺娲惧崟;")
private Integer acceptType;
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
- @ExcelColumn(name="寮�濮嬩綔涓氭椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date workStartTime;
@ApiModelProperty(value = "瀹屾垚鏃堕棿")
- @ExcelColumn(name="瀹屾垚鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name = "瀹屾垚鏃堕棿",index = 10,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date finishTime;
@ApiModelProperty(value = "骞冲彴鎻愭垚姣斾緥", example = "1")
- @ExcelColumn(name="骞冲彴鎻愭垚姣斾緥")
private BigDecimal platformRata;
@ApiModelProperty(value = "寰俊骞冲彴浜ゆ槗璁㈠崟鍙�")
- @ExcelColumn(name="寰俊骞冲彴浜ゆ槗璁㈠崟鍙�")
private String wxExternalNo;
@ApiModelProperty(value = "鏄惁璇勪环:0=鍚︼紱1=鏄�", example = "1")
- @ExcelColumn(name="鏄惁璇勪环:0=鍚︼紱1=鏄�")
private Integer commentStatus;
@ApiModelProperty(value = "璇勪环鍐呭")
- @ExcelColumn(name="璇勪环鍐呭")
private String commentInfo;
@ApiModelProperty(value = "璇勪环鏄熺骇1-5", example = "1")
- @ExcelColumn(name="璇勪环鏄熺骇1-5")
private Integer commentLevel;
@ApiModelProperty(value = "璇勪环鏃堕棿")
- @ExcelColumn(name="璇勪环鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date commentTime;
@ApiModelProperty(value = "璇勪环绫诲瀷:0=鎵嬪姩璇勪环锛�1=绯荤粺鑷姩璇勪环锛�", example = "1")
- @ExcelColumn(name="璇勪环绫诲瀷:0=鎵嬪姩璇勪环锛�1=绯荤粺鑷姩璇勪环锛�")
private Integer commentType;
@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")
private Integer isUpdate;
+ @ApiModelProperty(value = "淇敼鏃堕棿", example = "1")
+ private Date isUpdateTime;
+
@ApiModelProperty(value = "鎺ュ崟鏂归粦鍚嶅崟member:id 澶氫釜浠�,鍒嗗壊")
- @ExcelColumn(name="鎺ュ崟鏂归粦鍚嶅崟member:id 澶氫釜浠�,鍒嗗壊")
private String blackReceive;
- @ApiModelProperty
+
+ @ApiModelProperty(value = "鎬诲ぉ鏁�", example = "1")
+ private Integer totalDays;
+
+ @ApiModelProperty(value = "鍙栨秷绫诲瀷锛�0=鍙戝崟鏂规棤璐ｅ彇娑堬紱1=鍙戝崟鏂规湁璐ｅ彇娑堬紱2=绯荤粺鍙栨秷锛�", example = "1")
+ private Integer cancelType;
+
+ @ApiModelProperty(value = "鏀粯鏂瑰紡锛�0=寰俊锛�1=鍏朵粬", example = "1")
+ private Integer payMethod;
+
+ @ApiModelProperty(value = "鏀粯鏃堕棿", example = "1")
+ private Date payTime;
+
+ @ApiModelProperty(value = "鑱旂郴浜�", example = "1")
+ private String linkPhone;
+
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡", example = "1")
+ private String linkName;
+
+ @ApiModelProperty(value = "杞﹁締瑙勬牸", example = "1")
+ private String carUnit;
+
+ @ApiModelProperty(value = "涓夋柟鏀粯璁㈠崟鍙�", example = "1")
+ private String outTradeNo;
+
+ @ApiModelProperty(value = "鍥剧墖")
@TableField(exist = false)
private List<Multifile> multifileList;
+
+ @ApiModelProperty(value = "鏃ュ織鍒楄〃")
+ @TableField(exist = false)
+ private List<OrderLog> orderLogList;
+
+ @ApiModelProperty(value = "璁㈠崟鐘舵�佹弿杩�", example = "1")
+ @TableField(exist = false)
+ private String statusName;
+
+
+ @ApiModelProperty(value = "閫旂粡鐐�")
+ @TableField(exist = false)
+ private List<WayInfoDTO> wayInfoDTOList;
+
+ @ApiModelProperty(value = "椁愭爣")
+ @TableField(exist = false)
+ private List<CateringDTO> cateringDTOList;
+
+ @ApiModelProperty(value = "绉诲姩绔敤鎴�")
+ @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;
+
+ @ApiModelProperty(value = "鎺ュ崟鏂瑰悕绉�")
+ @TableField(exist = false)
+ @ExcelColumn(name = "鎺ュ崟鏂瑰悕绉�",index = 6,width = 10)
+ private String acceptName;
+
+ @ApiModelProperty(value = "鎺ュ崟鏂规墜鏈哄彿")
+ @TableField(exist = false)
+ @ExcelColumn(name = "鎺ュ崟鏂硅仈绯绘柟寮�",index = 7,width = 10)
+ private String acceptPhone;
+
+ @ApiModelProperty(value = "鍙戝崟鏂瑰悕绉�")
+ @TableField(exist = false)
+ @ExcelColumn(name = "鍙戝崟鏂瑰悕绉�",index = 4,width = 10)
+ private String releaseName;
+
+ @ApiModelProperty(value = "鍙戝崟鏂规墜鏈哄彿")
+ @TableField(exist = false)
+ @ExcelColumn(name = "鍙戝崟鏂规墜鏈哄彿",index = 5,width = 10)
+ private String releasePhone;
+
+ @ApiModelProperty(value = "璁㈠崟鍐呭")
+ @TableField(exist = false)
+ @ExcelColumn(name = "璁㈠崟鍐呭",index = 3,width = 20)
+ private String orderContent;
+
+
+ @ApiModelProperty(value = "鍙戝崟鏃堕棿璧�")
+ @TableField(exist = false)
+ private Date createTimeStart;
+
+ @ApiModelProperty(value = "鍙戝崟鏃堕棿姝�")
+ @TableField(exist = false)
+ private Date createTimeEnd;
+
+ @ApiModelProperty(value = "璐圭敤鏍囧噯鍗曚綅", example = "1")
+ @TableField(exist = false)
+ private String priceUnit;
+
+
+ @ApiModelProperty(value = "鎺ュ崟鏃堕棿璧�")
+ @TableField(exist = false)
+ private Date acceptTimeStart;
+
+ @ApiModelProperty(value = "鎺ュ崟鏃堕棿姝�")
+ @TableField(exist = false)
+ private Date acceptTimeEnd;
+
+
+ @ApiModelProperty(hidden = true)
+ @TableField(exist = false)
+ @ExcelColumn(name = "棰勪及閲戦锛堝厓锛�",index = 12,width = 10)
+ private double estimatedAccountYuan;
+
+ @ApiModelProperty(hidden = true)
+ @TableField(exist = false)
+ @ExcelColumn(name = "瀹炰粯閲戦锛堝厓锛�",index = 13,width = 10)
+ private double payAccountYuan;
+
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿璧�")
+ @TableField(exist = false)
+ private Date doneTimeStart;
+
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿姝�")
+ @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