From 7eebfc8a64d2cbbd73453a2b653d5a5bfd66a32f Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 16 四月 2026 20:10:44 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 66 +++++++++++++++++++++++++++++----
1 files changed, 58 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 f4a690c..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
@@ -66,7 +66,8 @@
private Integer selfTake;
@ApiModelProperty(value = "璁㈠崟鐘舵��", example = "0")
- @ExcelColumn(name = "璁㈠崟鐘舵��", valueMapping = "0=寰呮敮浠�;1=寰呭瘎瀛�;2=宸插瘎瀛�;3=寰呭彇浠�;6=瀛樺湪閫炬湡;7=宸插畬鎴�;98=宸叉寕璧�;99=宸插彇娑�;")
+ @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 = "0")
@@ -89,13 +90,13 @@
@ExcelColumn(name = "瀛樹欢搴楅摵")
private Integer depositShopId;
- @ApiModelProperty(value = "棰勮鍒板簵瀛樹欢鏃堕棿璧�")
+ @ApiModelProperty(value = "棰勮鍒板簵瀛樹欢鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date arriveStartTime;
+ private Date expectedDepositTime;
- @ApiModelProperty(value = "棰勮鍒板簵瀛樹欢鏃堕棿姝�")
+ @ApiModelProperty(value = "棰勮鍒板簵鍙栦欢鏃堕棿姝�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date arriveEndTime;
+ private Date expectedTakeTime;
@ApiModelProperty(value = "瀛樹欢鍦扮偣")
@ExcelColumn(name = "瀛樹欢鍦扮偣")
@@ -103,7 +104,7 @@
@ApiModelProperty(value = "瀛樹欢鍦扮偣鎻忚堪")
@ExcelColumn(name = "瀛樹欢鍦扮偣鎻忚堪")
- private String depositLocationReamrk;
+ private String depositLocationRemark;
@ApiModelProperty(value = "瀛樹欢鐐圭粡搴�")
private BigDecimal depositLat;
@@ -121,7 +122,7 @@
@ApiModelProperty(value = "鍙栦欢鍦扮偣璇︾粏鍦板潃")
@ExcelColumn(name = "鍙栦欢鍦扮偣璇︾粏鍦板潃")
- private String takeLocationReamrk;
+ private String takeLocationRemark;
@ApiModelProperty(value = "鍙栦欢缁忓害")
private BigDecimal takeLat;
@@ -237,6 +238,10 @@
@ExcelColumn(name = "鎸囨淳鍙告満")
private Integer assignDriverId;
+ @ApiModelProperty(value = "鍩虹瀵勫瓨璐圭敤锛堝垎锛�")
+ @ExcelColumn(name = "鍩虹瀵勫瓨璐圭敤")
+ private Long basicAmount;
+
@ApiModelProperty(value = "璁㈠崟鎬昏垂鐢紙鍒嗭級")
@ExcelColumn(name = "璁㈠崟鎬昏垂鐢�")
private Long totalAmount;
@@ -256,6 +261,16 @@
@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=宸叉敮浠�;")
@@ -322,7 +337,7 @@
@ExcelColumn(name = "寮傚父璐圭敤")
private Long exceptionAmount;
- @ApiModelProperty(value = "寮傚父琛ュ伩/琛ュ伩鍙告満锛堝垎锛�")
+ @ApiModelProperty(value = "寮傚父琛ュ伩鍙告満锛堝垎锛�")
@ExcelColumn(name = "寮傚父琛ュ伩")
private Long exceptionFee;
@@ -332,6 +347,13 @@
@ApiModelProperty(value = "缁撶畻鐘舵�侊細0=寰呯粨绠楋紱1=宸茬粨绠楋紱")
private Integer settlementStatus;
+
+ @ApiModelProperty(value = "缁撶畻鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date settlementTime;
+
+ @ApiModelProperty(value = "涓夋柟璁㈠崟鍙�")
+ private String outTradeNo;
@TableField(exist = false)
@ApiModelProperty(value = "鍒涘缓寮�濮嬫椂闂�(鏌ヨ鐢�)", example = "2026-01-01")
@@ -347,4 +369,32 @@
@ApiModelProperty(value = "璁㈠崟绾у埆")
private String orderLevel;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍙告満鍏抽敭瀛楋紙濮撳悕/鎵嬫満鍙凤級")
+ private String driverKeyword;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瀵勪欢闂ㄥ簵鍚嶇О锛堝叧鑱旀煡璇級")
+ private String depositShopName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瀵勪欢闂ㄥ簵鑱旂郴浜猴紙鍏宠仈鏌ヨ锛�")
+ private String depositShopLinkName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瀵勪欢闂ㄥ簵鑱旂郴鐢佃瘽锛堝叧鑱旀煡璇級")
+ private String depositShopLinkPhone;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瀵勪欢闂ㄥ簵鍦板潃锛堝叧鑱旀煡璇級")
+ private String depositShopAddress;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍙栦欢闂ㄥ簵鍚嶇О锛堝叧鑱旀煡璇級")
+ private String takeShopName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍙栦欢闂ㄥ簵鍦板潃锛堝叧鑱旀煡璇級")
+ private String takeShopAddress;
+
}
--
Gitblit v1.9.3