From 5ae8418d22dd7ba374ff7277181aceec1d509324 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 七月 2025 18:26:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 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 67d9c3f..50289c1 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
@@ -25,6 +25,7 @@
@TableName("`orders`")
public class Orders {
+ @TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
private Integer id;
@@ -55,9 +56,11 @@
private Integer type;
@ApiModelProperty(value = "寮�濮嬫椂闂� yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "缁撴潫鏃堕棿 yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
@ApiModelProperty(value = "鍦扮偣淇℃伅/鐢ㄨ溅璧风偣/鐢ㄩ鍦扮偣")
@@ -99,11 +102,14 @@
@ApiModelProperty(value = "璐圭敤鏍囧噯", example = "1")
private Long price;
+
@ApiModelProperty(value = "棰勪及璐圭敤", example = "1")
private Long estimatedAccount;
+
@ApiModelProperty(value = "瀹為檯鏀粯璐圭敤", example = "1")
private Long payAccount;
+
@ApiModelProperty(value = "瀹炴敹璐圭敤", example = "1")
private Long receiveAccount;
@@ -151,6 +157,7 @@
private Integer acceptMemberId;
@ApiModelProperty(value = "鎺ュ崟绫诲瀷:0=鎵嬪姩鎺ュ崟锛�1=绯荤粺娲惧崟锛�", example = "1")
+ @ExcelColumn(name = "鎺ュ崟鏂瑰紡",index = 14,width = 10,valueMapping = "0=鎵嬪姩鎺ュ崟;1=绯荤粺娲惧崟;")
private Integer acceptType;
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
@@ -187,6 +194,9 @@
@ApiModelProperty(value = "鏄惁宸蹭慨鏀�:0=鍚︼紱1=鏄紱2=宸茬‘璁�;", example = "1")
private Integer isUpdate;
+ @ApiModelProperty(value = "淇敼鏃堕棿", example = "1")
+ private Integer isUpdateTime;
+
@ApiModelProperty(value = "鎺ュ崟鏂归粦鍚嶅崟member:id 澶氫釜浠�,鍒嗗壊")
private String blackReceive;
@@ -197,6 +207,21 @@
@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 = "鍥剧墖")
@TableField(exist = false)
private List<Multifile> multifileList;
@@ -206,6 +231,9 @@
@TableField(exist = false)
private List<OrderLog> orderLogList;
+ @ApiModelProperty(value = "璁㈠崟鐘舵�佹弿杩�", example = "1")
+ @TableField(exist = false)
+ private String statusName;
@ApiModelProperty(value = "閫旂粡鐐�")
@@ -271,6 +299,9 @@
@TableField(exist = false)
private Date createTimeEnd;
+ @ApiModelProperty(value = "璐圭敤鏍囧噯鍗曚綅", example = "1")
+ @TableField(exist = false)
+ private String priceUnit;
@ApiModelProperty(value = "鎺ュ崟鏃堕棿璧�")
@@ -282,6 +313,15 @@
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)
--
Gitblit v1.9.3