From eb7a808aaf7dd0a6dd2ff70f9ef3f8ce0b1e31d1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 五月 2026 18:27:32 +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 | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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 ad38d6f..11286c2 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
@@ -57,9 +57,12 @@
@ExcelColumn(name = "浼氬憳涓婚敭")
private Integer memberId;
- @ApiModelProperty(value = "瀵勫瓨鏂瑰紡:0=灏卞湴瀛樺彇锛�1=寮傚湴瀛樺彇", example = "0")
- @ExcelColumn(name = "瀵勫瓨鏂瑰紡", valueMapping = "0=灏卞湴瀛樺彇;1=寮傚湴瀛樺彇;")
+ @ApiModelProperty(value = "瀵勫瓨鏂瑰紡:0=灏卞湴瀵勫瓨锛�1=鍚屽煄瀵勯��", example = "0")
+ @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=鏄�;")
@@ -77,6 +80,10 @@
@ApiModelProperty(value = "鍏宠仈涓昏鍗�")
@ExcelColumn(name = "鍏宠仈涓昏鍗�")
private Integer relationOrderId;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍏宠仈璁㈠崟鍙�")
+ private String relationOrderCode;
@ApiModelProperty(value = "寮傚父鍘熷洜")
@ExcelColumn(name = "寮傚父鍘熷洜")
@@ -130,7 +137,7 @@
@ApiModelProperty(value = "鍙栦欢绾害")
private BigDecimal takeLgt;
- @ApiModelProperty(value = "璺濈锛堝紓鍦板瓨鍙栦娇鐢級")
+ @ApiModelProperty(value = "璺濈锛堝悓鍩庡瘎閫佷娇鐢級")
@ExcelColumn(name = "璺濈")
private BigDecimal distance;
@@ -210,7 +217,7 @@
@ExcelColumn(name = "棰勪及璐圭敤")
private Long estimatedAmount;
- @ApiModelProperty(value = "鍩虹璐圭敤/鍗曚环锛堝垎锛�")
+ @ApiModelProperty(value = "鍩虹璐圭敤-鍗曚环锛堝垎锛�")
@ExcelColumn(name = "鍩虹璐圭敤")
private Long price;
@@ -230,11 +237,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 +251,7 @@
@ExcelColumn(name = "鍩虹瀵勫瓨璐圭敤")
private Long basicAmount;
- @ApiModelProperty(value = "璁㈠崟鎬昏垂鐢紙鍒嗭級")
+ @ApiModelProperty(value = "璁㈠崟鎬昏垂鐢紙鍒嗭級",notes = "璁″叆閫炬湡璐圭敤涓庝紭鎯犲埜璐圭敤")
@ExcelColumn(name = "璁㈠崟鎬昏垂鐢�")
private Long totalAmount;
@@ -362,6 +368,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;
--
Gitblit v1.9.3