From e50954f0708ecbbc672352102ae3b24279d40cc1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 16 四月 2026 20:12:50 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 612 +++++++++++++++++++++++++++---------------------------
1 files changed, 305 insertions(+), 307 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 d0d91e4..d8b5f77 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,402 +1,400 @@
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;
+import com.baomidou.mybatisplus.annotation.TableField;
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.doumee.core.annotation.excel.ExcelColumn;
import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
import java.math.BigDecimal;
-import java.util.List;
+import java.util.Date;
/**
- * 璁㈠崟淇℃伅璁板綍
- * @author 姹熻箘韫�
- * @date 2025/07/09 12:00
+ * 瀵勫瓨璁㈠崟淇℃伅
+ * @author rk
+ * @date 2026/04/10
*/
@Data
-@ApiModel("璁㈠崟淇℃伅璁板綍")
+@ApiModel("瀵勫瓨璁㈠崟淇℃伅")
@TableName("`orders`")
public class Orders {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
+ @ExcelColumn(name = "涓婚敭")
private Integer id;
- @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
+ @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "0")
+ @ExcelColumn(name = "鏄惁宸插垹闄�")
private Integer deleted;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ExcelColumn(name = "鍒涘缓浜虹紪鐮�")
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name = "鍙戝竷鏃堕棿",index = 8,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name = "鍒涘缓鏃堕棿", width = 16, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ExcelColumn(name = "鏇存柊浜虹紪鐮�")
private Integer updateUser;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "鍙戝崟鏂�", example = "1")
- private Integer releaseMemberId;
+ @ApiModelProperty(value = "浼氬憳涓婚敭", example = "1")
+ @ExcelColumn(name = "浼氬憳涓婚敭")
+ private Integer memberId;
- @ApiModelProperty(value = "绫诲瀷:0=鐢ㄥ伐锛�1=杩愯揣锛�2=璁㈤", example = "1")
- @ExcelColumn(name = "璁㈠崟绫诲瀷",valueMapping = "0=鐢ㄥ伐鍗�;1=璐ц繍鍗�;2=璁㈤鍗�;",index = 2,width = 10)
+ @ApiModelProperty(value = "瀵勫瓨鏂瑰紡:0=灏卞湴瀛樺彇锛�1=寮傚湴瀛樺彇", example = "0")
+ @ExcelColumn(name = "瀵勫瓨鏂瑰紡", valueMapping = "0=灏卞湴瀛樺彇;1=寮傚湴瀛樺彇;")
private Integer type;
- @ApiModelProperty(value = "寮�濮嬫椂闂� yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
+ @ApiModelProperty(value = "鏄惁蹇呴』鏈汉绛炬敹锛�0=鍚︼紱1=鏄�", example = "0")
+ @ExcelColumn(name = "鏈汉绛炬敹", valueMapping = "0=鍚�;1=鏄�;")
+ private Integer selfTake;
- @ApiModelProperty(value = "缁撴潫鏃堕棿 yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date endDate;
-
- @ApiModelProperty(value = "鍦扮偣淇℃伅/鐢ㄨ溅璧风偣/鐢ㄩ鍦扮偣")
- private String location;
-
- @ApiModelProperty(value = "鍦扮偣鎻忚堪")
- private String locationRemark;
-
- @ApiModelProperty(value = "缁忓害", example = "1")
- private BigDecimal lat;
-
- @ApiModelProperty(value = "鐪佷唤")
- private String province;
-
- @ApiModelProperty(value = "鍩庡競")
- private String city;
-
- @ApiModelProperty(value = "鍖哄幙")
- private String area;
-
- @ApiModelProperty(value = "绾害", example = "1")
- private BigDecimal lgt;
-
- @ApiModelProperty(value = "闇�姹傜被鍨嬶紙杩愯揣/鐢ㄥ伐)锛氬叧鑱� category", example = "1")
- private Integer categoryId;
-
- @ApiModelProperty(value = "鐢ㄥ伐绫诲瀷:0=閲囨憳宸ワ紱1=鍒嗘嫞宸ワ紱2=鍖呰宸ワ紱锛堢敤宸ヨ鍗曪級", example = "1")
- private Integer workType;
-
- @ApiModelProperty(value = "璁′环鏁伴噺1((閲嶉噺/浜烘暟/锛堝ぉ鏁�/灏忔椂/閲嶉噺锛�/锛堝ぉ鏁�/娆℃暟锛�/鐢ㄩ澶╂暟)", example = "1")
- private Integer priceNum1;
-
- @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 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;
-
- @ApiModelProperty(value = "鐢ㄨ溅绫诲瀷(鐢ㄥ伐鍖呰/杩愯揣浣跨敤):0=澶�;1=娆�/灏忔椂;2=閲嶉噺", example = "1")
- private Integer carType;
-
- @ApiModelProperty(value = "杩愯緭鍝佺(杩愯揣浣跨敤) 鍏宠仈category琛�", example = "1")
- private Integer transportTypeId;
-
- @ApiModelProperty(value = "杩愯緭閲嶉噺/鏁伴噺", example = "1")
- private Integer transportNum;
-
- @ApiModelProperty(value = "杩愯緭鍗曚綅(涓�/鏂�)")
- private String transportUnit;
-
- @ApiModelProperty(value = "鐢ㄨ溅缁堢偣鍦板潃")
- private String locationEnd;
-
- @ApiModelProperty(value = "鐢ㄨ溅缁堢偣缁忓害")
- private String latEnd;
-
- @ApiModelProperty(value = "鐢ㄨ溅缁堢偣绾害")
- private String lgtEnd;
-
- @ApiModelProperty(value = "閫旂粡鐐�/椁愭爣淇℃伅")
- private String wayInfo;
-
- @ApiModelProperty(value = "璁㈠崟缂栧彿")
- @ExcelColumn(name = "璁㈠崟缂栧彿",index = 1,width = 10)
- private String code;
-
- @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=宸插彇娑�;")
+ @ApiModelProperty(value = "璁㈠崟鐘舵��", example = "0")
+ @ExcelColumn(name = "璁㈠崟鐘舵��", valueMapping = "灏卞湴瀵勫瓨鐘舵�侊細0=寰呮敮浠�;1=寰呭瘎瀛�;2=宸插瘎瀛�;5=寰呭彇浠�;6=瀛樺湪閫炬湡;7=宸插畬鎴�;96:璁㈠崟鍏抽棴锛堥��娆撅級;97:鍙栨秷閫炬湡;98=鍙栨秷涓�;99=宸插彇娑�;" +
+ "寮傚湴瀵勫瓨鐘舵�侊細0=寰呮敮浠�;1=寰呭瘎瀛�;2=宸插瘎瀛�;3=宸叉帴鍗�;4=娲鹃�佷腑;5=宸插埌搴�/宸查�佽揪;6=瀛樺湪閫炬湡;7=宸插畬鎴�;96:璁㈠崟鍏抽棴锛堥��娆撅級;97:鍙栨秷閫炬湡;98=鍙栨秷涓�;99=宸插彇娑�;")
private Integer status;
- @ApiModelProperty(value = "鏀粯鐘舵��:0=寰呮敮浠� 1=宸叉敮浠�", example = "1")
- private Integer payStatus;
+ @ApiModelProperty(value = "鏄惁寮傚父璁㈠崟锛�0=鍚︼紱1=鏄�", example = "0")
+ @ExcelColumn(name = "寮傚父璁㈠崟", valueMapping = "0=鍚�;1=鏄�;")
+ private Integer exceptionStatus;
+
+ @ApiModelProperty(value = "鍏宠仈涓昏鍗�")
+ @ExcelColumn(name = "鍏宠仈涓昏鍗�")
+ private Integer relationOrderId;
+
+ @ApiModelProperty(value = "寮傚父鍘熷洜")
+ @ExcelColumn(name = "寮傚父鍘熷洜")
+ private String exceptionInfo;
+
+ @ApiModelProperty(value = "鎵�灞炲煄甯傦紙areas:id锛�")
+ @ExcelColumn(name = "鎵�灞炲煄甯�")
+ private String cityId;
+
+ @ApiModelProperty(value = "瀛樹欢搴楅摵锛坰hop_info:id锛�", example = "1")
+ @ExcelColumn(name = "瀛樹欢搴楅摵")
+ private Integer depositShopId;
+
+ @ApiModelProperty(value = "棰勮鍒板簵瀛樹欢鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date expectedDepositTime;
+
+ @ApiModelProperty(value = "棰勮鍒板簵鍙栦欢鏃堕棿姝�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date expectedTakeTime;
+
+ @ApiModelProperty(value = "瀛樹欢鍦扮偣")
+ @ExcelColumn(name = "瀛樹欢鍦扮偣")
+ private String depositLocation;
+
+ @ApiModelProperty(value = "瀛樹欢鍦扮偣鎻忚堪")
+ @ExcelColumn(name = "瀛樹欢鍦扮偣鎻忚堪")
+ private String depositLocationRemark;
+
+ @ApiModelProperty(value = "瀛樹欢鐐圭粡搴�")
+ private BigDecimal depositLat;
+
+ @ApiModelProperty(value = "瀛樹欢鐐圭含搴�")
+ private BigDecimal depositLgt;
+
+ @ApiModelProperty(value = "鍙栦欢搴楅摵锛坰hop_info:id锛�", example = "1")
+ @ExcelColumn(name = "鍙栦欢搴楅摵")
+ private Integer takeShopId;
+
+ @ApiModelProperty(value = "鍙栦欢鍦扮偣")
+ @ExcelColumn(name = "鍙栦欢鍦扮偣")
+ private String takeLocation;
+
+ @ApiModelProperty(value = "鍙栦欢鍦扮偣璇︾粏鍦板潃")
+ @ExcelColumn(name = "鍙栦欢鍦扮偣璇︾粏鍦板潃")
+ private String takeLocationRemark;
+
+ @ApiModelProperty(value = "鍙栦欢缁忓害")
+ private BigDecimal takeLat;
+
+ @ApiModelProperty(value = "鍙栦欢绾害")
+ private BigDecimal takeLgt;
+
+ @ApiModelProperty(value = "璺濈锛堝紓鍦板瓨鍙栦娇鐢級")
+ @ExcelColumn(name = "璺濈")
+ private BigDecimal distance;
+
+ @ApiModelProperty(value = "瀵勫瓨鏃堕棿锛堝瘎瀛樺紑濮嬭璐规椂闂达級")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name = "瀵勫瓨鏃堕棿", width = 16, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date depositTime;
@ApiModelProperty(value = "鎺ュ崟鏃堕棿")
- @ExcelColumn(name = "鎺ュ崟鏃堕棿",index = 9,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date acceptTime;
- @ApiModelProperty(value = "鎺ュ崟浜�", example = "1")
- private Integer acceptMemberId;
+ @ApiModelProperty(value = "鎺ュ崟浜�")
+ @ExcelColumn(name = "鎺ュ崟浜�")
+ private Integer acceptDriver;
- @ApiModelProperty(value = "鎺ュ崟绫诲瀷:0=鎵嬪姩鎺ュ崟锛�1=绯荤粺娲惧崟锛�", example = "1")
- @ExcelColumn(name = "鎺ュ崟鏂瑰紡",index = 14,width = 10,valueMapping = "0=鎵嬪姩鎺ュ崟;1=绯荤粺娲惧崟;")
+ @ApiModelProperty(value = "鎺ュ崟绫诲瀷:0=鎵嬪姩鎺ュ崟锛�1=绯荤粺娲惧崟", example = "0")
+ @ExcelColumn(name = "鎺ュ崟绫诲瀷", valueMapping = "0=鎵嬪姩鎺ュ崟;1=绯荤粺娲惧崟;")
private Integer acceptType;
- @ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
- private Date workStartTime;
+ @ApiModelProperty(value = "鍙栦欢鏃堕棿锛堝瘎瀛樼粨鏉熻璐规椂闂达級")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date takeTime;
- @ApiModelProperty(value = "瀹屾垚鏃堕棿")
- @ExcelColumn(name = "瀹屾垚鏃堕棿",index = 10,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍙告満鍙栦欢鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date driverTakeTime;
+
+ @ApiModelProperty(value = "鍙告満寮�濮嬫淳閫佹椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date sendTime;
+
+ @ApiModelProperty(value = "琛屾潕杞Щ鍒板簵鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date arriveTime;
+
+ @ApiModelProperty(value = "瀹屾垚璁㈠崟鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date finishTime;
- @ApiModelProperty(value = "骞冲彴鎻愭垚姣斾緥", example = "1")
- private BigDecimal platformRata;
+ @ApiModelProperty(value = "纭浼氬憳鍒板簵鍙栦欢鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date confirmArriveTime;
+
+ @ApiModelProperty(value = "鎸傝捣鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date suspendTime;
+
+ @ApiModelProperty(value = "鍙栦欢浜烘墜鏈哄彿")
+ @ExcelColumn(name = "鍙栦欢浜烘墜鏈哄彿")
+ private String takePhone;
+
+ @ApiModelProperty(value = "鍙栦欢浜哄悕绉�")
+ @ExcelColumn(name = "鍙栦欢浜哄悕绉�")
+ private String takeUser;
+
+ @ApiModelProperty(value = "鍟嗗搧绫诲瀷锛坈ategory锛�")
+ @ExcelColumn(name = "鍟嗗搧绫诲瀷")
+ private Integer goodType;
+
+ @ApiModelProperty(value = "琛ュ厖淇℃伅")
+ @ExcelColumn(name = "琛ュ厖淇℃伅")
+ private String supplement;
+
+ @ApiModelProperty(value = "棰勮瀛樻斁澶╂暟 榛樿1澶�", example = "1")
+ @ExcelColumn(name = "棰勮瀛樻斁澶╂暟")
+ private Integer estimatedDepositDays;
+
+ @ApiModelProperty(value = "瀹為檯瀛樻斁澶╂暟")
+ @ExcelColumn(name = "瀹為檯瀛樻斁澶╂暟")
+ private Integer depositDays;
+
+ @ApiModelProperty(value = "棰勪及璐圭敤锛堝垎锛�")
+ @ExcelColumn(name = "棰勪及璐圭敤")
+ private Long estimatedAmount;
+
+ @ApiModelProperty(value = "鍩虹璐圭敤/鍗曚环锛堝垎锛�")
+ @ExcelColumn(name = "鍩虹璐圭敤")
+ private Long price;
+
+ @ApiModelProperty(value = "鍔犳�ョ郴鏁�")
+ private BigDecimal urgentRata;
+
+ @ApiModelProperty(value = "鏄惁鍔犳�ワ細0=鍚︼紱1=鏄�", example = "0")
+ @ExcelColumn(name = "鏄惁鍔犳��", valueMapping = "0=鍚�;1=鏄�;")
+ private Integer isUrgent;
+
+ @ApiModelProperty(value = "淇濅环閲戦锛堝垎锛�")
+ @ExcelColumn(name = "淇濅环閲戦")
+ private Long declaredAmount;
+
+ @ApiModelProperty(value = "淇濅环淇濊垂锛堝垎锛�")
+ @ExcelColumn(name = "淇濅环淇濊垂")
+ private Long declaredFee;
+
+ @ApiModelProperty(value = "鍔犳�ヨ垂鐢紙鍒嗭級")
+ @ExcelColumn(name = "鍔犳�ヨ垂鐢�")
+ private Long urgentAmount;
+
+ @ApiModelProperty(value = "骞冲彴濂栧姳鍙告満璐圭敤锛堝垎锛�")
+ @ExcelColumn(name = "骞冲彴濂栧姳鍙告満璐圭敤")
+ private Long platformRewardAmount;
+
+ @ApiModelProperty(value = "鎸囨淳鍙告満鐢ㄦ埛涓婚敭锛坢ember:id锛�")
+ @ExcelColumn(name = "鎸囨淳鍙告満")
+ private Integer assignDriverId;
+
+ @ApiModelProperty(value = "鍩虹瀵勫瓨璐圭敤锛堝垎锛�")
+ @ExcelColumn(name = "鍩虹瀵勫瓨璐圭敤")
+ private Long basicAmount;
+
+ @ApiModelProperty(value = "璁㈠崟鎬昏垂鐢紙鍒嗭級")
+ @ExcelColumn(name = "璁㈠崟鎬昏垂鐢�")
+ private Long totalAmount;
+
+ @ApiModelProperty(value = "瀹為檯鏀粯璐圭敤锛堝垎锛�")
+ @ExcelColumn(name = "瀹為檯鏀粯璐圭敤")
+ private Long payAmount;
+
+ @ApiModelProperty(value = "閫�娆捐垂鐢紙鍒嗭級")
+ @ExcelColumn(name = "閫�娆捐垂鐢�")
+ private Long refundAmount;
+
+ @ApiModelProperty(value = "閫炬湡璐圭敤锛堝垎锛�")
+ @ExcelColumn(name = "閫炬湡璐圭敤")
+ private Long overdueAmount;
+
+ @ApiModelProperty(value = "閫炬湡澶╂暟")
+ @ExcelColumn(name = "閫炬湡澶╂暟")
+ private Integer overdueDays;
+
+ @ApiModelProperty(value = "鏄惁閫炬湡: 0=鍚� 1=鏄� 2=宸叉敮浠�")
+ @ExcelColumn(name = "鏄惁閫炬湡", valueMapping = "0=鍚�;1=鏄�;2=宸叉敮浠�;")
+ private Integer overdueStatus;
+
+ @ApiModelProperty(value = "浼氬憳璁㈠崟鏍搁攢鐮�")
+ private String memberVerifyCode;
+
+ @ApiModelProperty(value = "鍙告満璁㈠崟鏍搁攢鐮�")
+ private String driverVerifyCode;
+
+ @ApiModelProperty(value = "鏀粯鐘舵�侊細0=鏈敮浠橈紱1=宸叉敮浠�", example = "0")
+ @ExcelColumn(name = "鏀粯鐘舵��", valueMapping = "0=鏈敮浠�;1=宸叉敮浠�;")
+ private Integer payStatus;
+
+ @ApiModelProperty(value = "鏀粯鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date payTime;
+
+ @ApiModelProperty(value = "璁㈠崟缂栧彿")
+ @ExcelColumn(name = "璁㈠崟缂栧彿")
+ private String code;
+
+ @ApiModelProperty(value = "鍙告満钖叕锛堝垎锛�")
+ @ExcelColumn(name = "鍙告満钖叕")
+ private Long driverFee;
+
+ @ApiModelProperty(value = "瀵勫瓨搴楅摵鏀剁泭锛堝垎锛�")
+ @ExcelColumn(name = "瀵勫瓨搴楅摵鏀剁泭")
+ private Long depositShopFee;
+
+ @ApiModelProperty(value = "鍙栦欢搴楅摵鏀剁泭锛堝垎锛�")
+ @ExcelColumn(name = "鍙栦欢搴楅摵鏀剁泭")
+ private Long takeShopFee;
+
+ @ApiModelProperty(value = "鍙告満鏀剁泭鍗犳瘮")
+ private BigDecimal driverFeeRata;
+
+ @ApiModelProperty(value = "瀵勫瓨搴楅摵鏀剁泭鍗犳瘮")
+ private BigDecimal depositShopFeeRata;
+
+ @ApiModelProperty(value = "鍙栦欢搴楅摵鏀剁泭鍗犳瘮")
+ private BigDecimal takeShopFeeRata;
@ApiModelProperty(value = "寰俊骞冲彴浜ゆ槗璁㈠崟鍙�")
private String wxExternalNo;
- @ApiModelProperty(value = "鏄惁璇勪环:0=鍚︼紱1=鏄�", example = "1")
+ @ApiModelProperty(value = "鏄惁璇勪环:0=鍚︼紱1=鏄�", example = "0")
+ @ExcelColumn(name = "鏄惁璇勪环", valueMapping = "0=鍚�;1=鏄�;")
private Integer commentStatus;
@ApiModelProperty(value = "璇勪环鍐呭")
+ @ExcelColumn(name = "璇勪环鍐呭")
private String commentInfo;
- @ApiModelProperty(value = "璇勪环鏄熺骇1-5", example = "1")
- private Integer commentLevel;
+ @ApiModelProperty(value = "璇勪环鍙告満鏄熺骇1-5")
+ private Integer commentDriverLevel;
+
+ @ApiModelProperty(value = "璇勪环瀵勫瓨鐐规槦绾�1-5")
+ private Integer commentDepositLevel;
+
+ @ApiModelProperty(value = "璇勪环鍙栦欢鐐规槦绾�1-5")
+ private Integer commentTakeLevel;
@ApiModelProperty(value = "璇勪环鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date commentTime;
- @ApiModelProperty(value = "璇勪环绫诲瀷:0=鎵嬪姩璇勪环锛�1=绯荤粺鑷姩璇勪环锛�", example = "1")
- private Integer commentType;
-
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cancelTime;
- @ApiModelProperty(value = "鏄惁宸蹭慨鏀�:0=鍚︼紱1=鏄紱2=宸茬‘璁�;", example = "1")
- private Integer isUpdate;
+ @ApiModelProperty(value = "寮傚父璐圭敤/瀹㈡埛鏀粯锛堝垎锛�")
+ @ExcelColumn(name = "寮傚父璐圭敤")
+ private Long exceptionAmount;
- @ApiModelProperty(value = "淇敼鏃堕棿", example = "1")
- private Date isUpdateTime;
+ @ApiModelProperty(value = "寮傚父琛ュ伩鍙告満锛堝垎锛�")
+ @ExcelColumn(name = "寮傚父琛ュ伩")
+ private Long exceptionFee;
- @ApiModelProperty(value = "鎺ュ崟鏂归粦鍚嶅崟member:id 澶氫釜浠�,鍒嗗壊")
- private String blackReceive;
+ @ApiModelProperty(value = "鐗╁搧淇℃伅")
+ @ExcelColumn(name = "鐗╁搧淇℃伅")
+ private String goodsInfo;
+ @ApiModelProperty(value = "缁撶畻鐘舵�侊細0=寰呯粨绠楋紱1=宸茬粨绠楋紱")
+ private Integer settlementStatus;
- @ApiModelProperty(value = "鎬诲ぉ鏁�", example = "1")
- private Integer totalDays;
+ @ApiModelProperty(value = "缁撶畻鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date settlementTime;
- @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")
+ @ApiModelProperty(value = "涓夋柟璁㈠崟鍙�")
private String outTradeNo;
- @ApiModelProperty(value = "鎺ュ崟鏂圭‘璁ら噾棰濇椂闂�")
- private Date confirmFeeTime;
-
- @ApiModelProperty(value = "鍥剧墖")
@TableField(exist = false)
- private List<Multifile> multifileList;
+ @ApiModelProperty(value = "鍒涘缓寮�濮嬫椂闂�(鏌ヨ鐢�)", example = "2026-01-01")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createStartTime;
-
- @ApiModelProperty(value = "鏃ュ織鍒楄〃")
@TableField(exist = false)
- private List<OrderLog> orderLogList;
+ @ApiModelProperty(value = "鍒涘缓缁撴潫鏃堕棿(鏌ヨ鐢�)", example = "2026-12-31")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createEndTime;
- @ApiModelProperty(value = "璁㈠崟鐘舵�佹弿杩�", example = "1")
@TableField(exist = false)
- private String statusName;
+ @ApiModelProperty(value = "璁㈠崟绾у埆")
+ private String orderLevel;
-
- @ApiModelProperty(value = "閫旂粡鐐�")
@TableField(exist = false)
- private List<WayInfoDTO> wayInfoDTOList;
+ @ApiModelProperty(value = "鍙告満鍏抽敭瀛楋紙濮撳悕/鎵嬫満鍙凤級")
+ private String driverKeyword;
- @ApiModelProperty(value = "椁愭爣")
@TableField(exist = false)
- private List<CateringDTO> cateringDTOList;
+ @ApiModelProperty(value = "瀵勪欢闂ㄥ簵鍚嶇О锛堝叧鑱旀煡璇級")
+ private String depositShopName;
- @ApiModelProperty(value = "绉诲姩绔敤鎴�")
@TableField(exist = false)
- private Member member;
+ @ApiModelProperty(value = "瀵勪欢闂ㄥ簵鑱旂郴浜猴紙鍏宠仈鏌ヨ锛�")
+ private String depositShopLinkName;
- @ApiModelProperty(value = "鏌ヨ鎴戠殑璁㈠崟锛�0=鍙戝崟鏂硅鍗曪紱1=鎺ュ崟鏂硅鍗曪紱2=鎺ュ崟澶у巺锛�", example = "1")
@TableField(exist = false)
- private Integer queryMyOrderType;
+ @ApiModelProperty(value = "瀵勪欢闂ㄥ簵鑱旂郴鐢佃瘽锛堝叧鑱旀煡璇級")
+ private String depositShopLinkPhone;
- @Schema(description ="淇敼纭鍊掕鏃�")
@TableField(exist = false)
- private Long confirmCountdown;
+ @ApiModelProperty(value = "瀵勪欢闂ㄥ簵鍦板潃锛堝叧鑱旀煡璇級")
+ private String depositShopAddress;
-
- @Schema(description ="鑷姩鍙栨秷鍊掕鏃�")
@TableField(exist = false)
- private Long cancelCountdown;
+ @ApiModelProperty(value = "鍙栦欢闂ㄥ簵鍚嶇О锛堝叧鑱旀煡璇級")
+ private String takeShopName;
-
- @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;
-
-
- @ApiModelProperty(value = "鏄惁鍙紑濮嬶細0=涓嶅彲浠ワ紱1=鍙互", example = "1")
- @TableField(exist = false)
- private Integer canStart;
+ @ApiModelProperty(value = "鍙栦欢闂ㄥ簵鍦板潃锛堝叧鑱旀煡璇級")
+ private String takeShopAddress;
}
-
--
Gitblit v1.9.3