From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 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 31f80a1..ae1f59d 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,8 +66,8 @@
private Integer selfTake;
@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=宸插彇娑�;")
+ @ExcelColumn(name = "璁㈠崟鐘舵��", valueMapping = "灏卞湴瀵勫瓨鐘舵�侊細0=寰呮敮浠�;1=寰呭瘎瀛�;2=宸插瘎瀛�;5=寰呭彇浠�;6=瀛樺湪閫炬湡;7=宸插畬鎴�;99=宸插彇娑�;" +
+ "寮傚湴瀵勫瓨鐘舵�侊細0=寰呮敮浠�;1=寰呭瘎瀛�;2=宸插瘎瀛�;3=宸叉帴鍗�;4=娲鹃�佷腑;5=宸插埌搴�/宸查�佽揪;6=瀛樺湪閫炬湡;7=宸插畬鎴�;99=宸插彇娑�;")
private Integer status;
@ApiModelProperty(value = "鏄惁寮傚父璁㈠崟锛�0=鍚︼紱1=鏄�", example = "0")
@@ -190,6 +190,9 @@
@ApiModelProperty(value = "鍟嗗搧绫诲瀷锛坈ategory锛�")
@ExcelColumn(name = "鍟嗗搧绫诲瀷")
private Integer goodType;
+
+ @ApiModelProperty(value = "鐗╁搧绾у埆锛坈ategory涓婚敭锛宼ype=3锛�")
+ private Integer goodLevel;
@ApiModelProperty(value = "琛ュ厖淇℃伅")
@ExcelColumn(name = "琛ュ厖淇℃伅")
@@ -359,14 +362,21 @@
@ApiModelProperty(value = "涓夋柟璁㈠崟鍙�")
private String outTradeNo;
+ @ApiModelProperty(value = "鏃犱汉鎺ュ崟鏄惁宸茬煭淇￠�氱煡骞冲彴锛�0=鍚︼紱1=鏄�", example = "0")
+ private Integer platformSmsNotified;
+
+ @ApiModelProperty(value = "鏃犱汉鎺ュ崟宸茬煭淇￠�氱煡骞冲彴鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date platformSmsNotifiedTime;
+
@TableField(exist = false)
- @ApiModelProperty(value = "鍒涘缓寮�濮嬫椂闂�(鏌ヨ鐢�)", example = "2026-01-01")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓寮�濮嬫椂闂�(鏌ヨ鐢�)", example = "2026-01-01 00:00:00")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createStartTime;
@TableField(exist = false)
- @ApiModelProperty(value = "鍒涘缓缁撴潫鏃堕棿(鏌ヨ鐢�)", example = "2026-12-31")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓缁撴潫鏃堕棿(鏌ヨ鐢�)", example = "2026-12-31 23:59:59")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createEndTime;
@TableField(exist = false)
@@ -409,4 +419,32 @@
@ApiModelProperty(value = "鐗╁搧绛夌骇璐甸噸鏍囪瘑锛堝叧鑱旀煡璇細0=鍚︼紱1=鏄級")
private String c2OtherField;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐗╁搧绛夌骇鍚嶇О锛堝叧鑱旀煡璇級")
+ private String goodLevelName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐗╁搧绫诲瀷鍚嶇О锛堝叧鑱旀煡璇級")
+ private String goodTypeName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏄惁瀛樺湪鐗瑰ぇ灏哄锛�0=鍚� 1=鏄紙鍏宠仈鏌ヨ锛�")
+ private Integer hasOversized;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁㈠崟鐘舵�佹弿杩�")
+ private String statusDesc;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍙告満濮撳悕锛堝叧鑱旀煡璇級")
+ private String driverName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍙告満鐢佃瘽锛堝叧鑱旀煡璇級")
+ private String driverPhone;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "闂ㄥ簵涓婚敭锛堝悓鏃舵煡璇㈠瓨浠�/鍙栦欢闂ㄥ簵锛�")
+ private Integer shopId;
+
}
--
Gitblit v1.9.3