From c74a6f59490cfb9a0ee37f70427739b74e7fbd58 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 20 五月 2026 08:50:29 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 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 eb14c99..77c5e9c 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
@@ -61,6 +61,9 @@
@ExcelColumn(name = "瀵勫瓨鏂瑰紡", valueMapping = "0=灏卞湴瀛樺彇;1=寮傚湴瀛樺彇;")
private Integer type;
+ @ApiModelProperty(value = "鏄惁杞崲璁㈠崟锛�0=鍚︼紱1=鏄紙寮傚湴杞氨鍦帮級", example = "0")
+ private Integer isConverted;
+
@ApiModelProperty(value = "鏄惁蹇呴』鏈汉绛炬敹锛�0=鍚︼紱1=鏄�", example = "0")
@ExcelColumn(name = "鏈汉绛炬敹", valueMapping = "0=鍚�;1=鏄�;")
private Integer selfTake;
@@ -210,7 +213,7 @@
@ExcelColumn(name = "棰勪及璐圭敤")
private Long estimatedAmount;
- @ApiModelProperty(value = "鍩虹璐圭敤/鍗曚环锛堝垎锛�")
+ @ApiModelProperty(value = "鍩虹璐圭敤-鍗曚环锛堝垎锛�")
@ExcelColumn(name = "鍩虹璐圭敤")
private Long price;
@@ -230,11 +233,10 @@
private Long declaredFee;
@ApiModelProperty(value = "鍔犳�ヨ垂鐢紙鍒嗭級")
- @ExcelColumn(name = "鍔犳�ヨ垂鐢�")
private Long urgentAmount;
@ApiModelProperty(value = "骞冲彴濂栧姳鍙告満璐圭敤锛堝垎锛�")
- @ExcelColumn(name = "骞冲彴濂栧姳鍙告満璐圭敤")
+ @ExcelColumn(name = "鍔犳�ヨ垂鐢�")
private Long platformRewardAmount;
@ApiModelProperty(value = "鎸囨淳鍙告満鐢ㄦ埛涓婚敭锛坢ember:id锛�")
@@ -245,7 +247,7 @@
@ExcelColumn(name = "鍩虹瀵勫瓨璐圭敤")
private Long basicAmount;
- @ApiModelProperty(value = "璁㈠崟鎬昏垂鐢紙鍒嗭級")
+ @ApiModelProperty(value = "璁㈠崟鎬昏垂鐢紙鍒嗭級",notes = "璁″叆閫炬湡璐圭敤涓庝紭鎯犲埜璐圭敤")
@ExcelColumn(name = "璁㈠崟鎬昏垂鐢�")
private Long totalAmount;
@@ -362,6 +364,21 @@
@ApiModelProperty(value = "涓夋柟璁㈠崟鍙�")
private String outTradeNo;
+ @ApiModelProperty(value = "浼樻儬鍒镐富閿�")
+ private Integer couponId;
+
+ @ApiModelProperty(value = "浼樻儬鍒告姷鎵ｉ噾棰濓紙鍒嗭級")
+ private Long deductionAmount;
+
+ @ApiModelProperty(value = "鏄惁鎵嬪姩閫�娆撅細0=鍚︼紱1=鏄�", example = "0")
+ private Integer manualRefund;
+
+ @ApiModelProperty(value = "鍙戠エ鐘舵�侊細0=涓嶅彲鐢宠锛�1=鍙敵璇凤紱2=鐢宠涓紱3=寮�鍏锋垚鍔燂紱99=寮�鍏峰け璐�", example = "0")
+ private Integer invoiceStatus;
+
+ @ApiModelProperty(value = "闂ㄥ簵寮傚父琛ュ伩閲戦锛堝垎锛�")
+ private Long shopCompensationAmount;
+
@ApiModelProperty(value = "鏃犱汉鎺ュ崟鏄惁宸茬煭淇￠�氱煡骞冲彴锛�0=鍚︼紱1=鏄�", example = "0")
private Integer platformSmsNotified;
@@ -371,12 +388,12 @@
@TableField(exist = false)
@ApiModelProperty(value = "鍒涘缓寮�濮嬫椂闂�(鏌ヨ鐢�)", example = "2026-01-01 00:00:00")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date createStartTime;
@TableField(exist = false)
@ApiModelProperty(value = "鍒涘缓缁撴潫鏃堕棿(鏌ヨ鐢�)", example = "2026-12-31 23:59:59")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date createEndTime;
@TableField(exist = false)
@@ -448,6 +465,12 @@
private Integer shopId;
+ @ApiModelProperty(value = "搴楅摵璁㈠崟搴忓彿")
+ private Long autoNum;
+
+ @ApiModelProperty(value = "鍙栦欢鏃堕棿鍗冲皢鍒拌揪閫氱煡鐘舵�侊細0=鏈�氱煡锛�1=宸查�氱煡")
+ private Integer pickUpNotifyStatus;
+
@ApiModelProperty(value = "搴忓彿")
@TableField(exist = false)
private Integer sortNum;
--
Gitblit v1.9.3