From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商
---
server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 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 b1d4831..3fd1618 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 = "璁㈠崟缂栫爜")
@@ -61,7 +60,7 @@
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,7 +70,7 @@
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,21 +79,21 @@
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;
@@ -102,15 +101,18 @@
@ApiModelProperty(value = "缁撶畻鎿嶄綔浜虹紪鐮侊紙鍏宠仈system_user)")
private String closeUserId;
- @ApiModelProperty(value = "缁撶畻绫诲瀷 0鑷姩缁撶畻 1骞冲彴浜哄伐缁撶畻 2绯荤粺鑷姩缁撶畻")
+ @ApiModelProperty(value = "缁撶畻绫诲瀷 0鐢ㄦ埛鑷缁撶畻 1骞冲彴浜哄伐寮哄埗缁撶畻 2绯荤粺鑷姩缁撶畻")
private Integer closeType;
+
+ @ApiModelProperty(value = "鐢ㄦ埛openid" )
+ @TableField(exist = false)
+ @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")
private Date startDate;
- @ApiModelProperty(value = "鐢ㄦ埛openid" )
- @TableField(exist = false)
- private String memberOpenid;
@ApiModelProperty(value = "鏌ヨ鎴鏃ユ湡锛堝寘鍚級", example = "2023-10-09 15:12:05")
@TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -118,13 +120,23 @@
@ApiModelProperty(value = "浜ゆ槗绗旀暟", example = "0")
@TableField(exist = false)
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 = "鏈�鍚庨��娆炬椂闂�")
@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;
}
--
Gitblit v1.9.3