From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化
---
server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 62 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 19 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java b/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
index 7591719..e0bf2db 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -25,7 +25,7 @@
public class Goodsorder {
@ApiModelProperty(value = "缂栫爜")
- @ExcelColumn(name="璁㈠崟缂栧彿",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="璁㈠崟缂栧彿",index = 2,width = 10,align = HorizontalAlignment.CENTER)
private String id;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@@ -47,7 +47,6 @@
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String info;
@ApiModelProperty(value = "璁㈠崟缂栫爜")
@@ -55,13 +54,17 @@
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
private String memberId;
-
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜")
+ private String objId;
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0濂楅鍗�")
+ private Integer objType;
+ @ApiModelProperty(value = "浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾 1濂楅鍗¤喘涔�")
+ private Integer type;
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
@TableField(exist = false)
private String memberName;
-
@ApiModelProperty(value = "浜ゆ槗閲戦")
- @ExcelColumn(name="鎶奸噾锛堝厓锛�",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鎶奸噾锛堝厓锛�",index = 4,width = 10,align = HorizontalAlignment.CENTER)
private BigDecimal money;
@ApiModelProperty(value = "鐘舵�� 0寰呮敮浠� 1宸叉敮浠� 2宸插彇娑� 3鏀粯澶辫触 4宸茬粨绠�")
@@ -71,8 +74,9 @@
private String preOrderid;
@ApiModelProperty(value = "鍦ㄧ嚎浜ゆ槗鍗曞彿")
- @ExcelColumn(name="浜ゆ槗鍗曞彿",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="浜ゆ槗鍗曞彿",index = 3,width = 10,align = HorizontalAlignment.CENTER)
private String onlineOrderid;
+
@ApiModelProperty(value = "鏀粯鐘舵�� 0寰呮敮浠� 1宸叉敮浠�")
private Integer payStatus;
@@ -80,34 +84,31 @@
private Integer payWay;
@ApiModelProperty(value = "鏀粯鏃堕棿")
- @ExcelColumn(name="浜ゆ娂閲戞椂闂�",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="浜ゆ娂閲戞椂闂�",index = 5,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss" )
private Date payDate;
- @ApiModelProperty(value = "浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾")
- private Integer type;
-
@ApiModelProperty(value = "缁撶畻閲戦(鍒嗭級")
- @ExcelColumn(name="缁撶畻閲戦",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="缁撶畻閲戦(鍏�)",index = 7,width = 10,align = HorizontalAlignment.CENTER)
private BigDecimal closeMoney;
@ApiModelProperty(value = "缁撶畻閫�娆惧崟鍙�(鍏宠仈refund)")
private String closeId;
@ApiModelProperty(value = "缁撶畻鏃堕棿")
-// @ExcelColumn(name="閫�娆剧粨绠楁椂闂�",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="缁撶畻鏃堕棿",index = 8,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date closeDate;
@ApiModelProperty(value = "缁撶畻澶囨敞")
private String closeInfo;
-
@ApiModelProperty(value = "缁撶畻鎿嶄綔浜虹紪鐮侊紙鍏宠仈system_user)")
private String closeUserId;
-
@ApiModelProperty(value = "缁撶畻绫诲瀷 0鐢ㄦ埛鑷缁撶畻 1骞冲彴浜哄伐寮哄埗缁撶畻 2绯荤粺鑷姩缁撶畻")
private Integer closeType;
-
+ @ApiModelProperty(value = "缁撶畻杞﹀瀷缂栫爜")
+ private String paramId;
@ApiModelProperty(value = "鐢ㄦ埛openid" )
@TableField(exist = false)
- private String memberOpenid;
+ @ExcelColumn(name="鐢ㄦ埛",index = 1 ,width = 10,align = HorizontalAlignment.CENTER)
+ private String openid;
@ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈燂紙鍖呭惈锛�", example = "2023-10-01 15:12:01")
@TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -121,11 +122,34 @@
private int countNum;
@ApiModelProperty(value = "閫�娆炬�婚(鍒嗭級")
@TableField(exist = false)
- @ExcelColumn(name="閫�娆炬�婚锛堝厓锛�",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="閫�鎶奸噾(鍏�)",index = 6,width = 10,align = HorizontalAlignment.CENTER)
private BigDecimal refundMoney;
-
+ @ApiModelProperty(value = "楠戣鍗℃姷鎵�(鍒嗭級")
+ @ExcelColumn(name="浼樻儬閲戦",index = 10,width = 10,align = HorizontalAlignment.CENTER)
+ @TableField(exist = false)
+ private BigDecimal discountMoney;
@ApiModelProperty(value = "鏈�鍚庨��娆炬椂闂�")
@TableField(exist = false)
- @ExcelColumn(name="閫�娆剧粨绠楁椂闂�",width = 10,align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="閫�娆炬椂闂�",index = 9,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date refundDate;
+ @ApiModelProperty(value = "鏈�杩戦獞琛岀姸鎬�")
+ @TableField(exist = false)
+ private Integer memberRidesStatus;
+ @ApiModelProperty(value = "鏄惁缁撶畻 0 鏈粨绠� 1宸茬粨绠�")
+ @TableField(exist = false)
+ private Integer closeStatus;
+
+ @ApiModelProperty(value = "鎿嶄綔浜�")
+ @TableField(exist = false)
+ private String refundUserName;
+
+ @ApiModelProperty(value = "濂楅鍚嶇О", example = "2023-10-01 15:12:01")
+ @TableField(exist = false)
+ private String discountName;
+
+ @ApiModelProperty(value = "楠戣绫诲瀷")
+ @ExcelColumn(name="璁㈠崟绫诲瀷",index = 11,width = 10,valueMapping = "3=鍗曡溅绫诲瀷;4=鐢佃溅绫诲瀷;",align = HorizontalAlignment.CENTER)
+ @TableField(exist = false)
+ private Integer bikeType;
+
}
--
Gitblit v1.9.3