From e3ab5aedd09b9e8b1d5e45077132f31e85bf6beb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 17 二月 2025 09:41:03 +0800
Subject: [PATCH] jtt808初始化
---
server/services/src/main/java/com/doumee/dao/business/model/Sites.java | 3 +++
server/services/src/main/java/com/doumee/dao/business/model/Bikes.java | 1 +
server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java | 13 +++++++++++--
server/services/src/main/java/com/doumee/dao/business/model/Refund.java | 9 ++++++---
4 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
index 0d8f16d..e6500d5 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
@@ -124,4 +124,5 @@
@ExcelColumn(name="鏈�杩戝畾浣嶅湴鍧�")
private String location;
+
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
index 7e08143..1555531 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
@@ -54,7 +54,16 @@
@ApiModelProperty(value = "杞﹁締缂栫爜")
@ExcelColumn(name="杞﹁締缂栫爜",index = 2,width = 10,align = HorizontalAlignment.CENTER)
private String bikeCode;
-
+ @ApiModelProperty(value = "濂楅鍗℃姷鎵ｆ椂闀匡紙鍒嗛挓锛�")
+ @ExcelColumn(name="濂楅鍗℃姷鎵ｆ椂闀匡紙鍒嗛挓锛�",index = 12, align = HorizontalAlignment.CENTER)
+ private String discountTime;
+ @ApiModelProperty(value = "濂楅鍗＄紪鐮侊紙鍏宠仈discount_member_id)")
+ private String discountMemberId;
+ @ApiModelProperty(value = "濂楅鎶垫墸浠锋牸锛堝厓锛�")
+ @ExcelColumn(name="濂楅鎶垫墸浠锋牸锛堝厓锛�",index = 13, align = HorizontalAlignment.CENTER)
+ private BigDecimal discountPrice;
+ @ApiModelProperty(value = "涓存椂鍋滆溅寮�濮嬫椂闂�")
+ private Date pauseDate;
@ApiModelProperty(value = "褰撳墠璐︽埛浣欓")
private BigDecimal balance;
@@ -123,7 +132,7 @@
@ApiModelProperty(value = "缁撶畻鐘舵�� 0鏈粨绠� 1宸茬粨鏉�")
private Integer closeStatus;
- @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�")
+ @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐� 4涓存椂閿佽溅")
private Integer status;
@ApiModelProperty(value = "鍏宠仈璁㈠崟缂栫爜(鍏宠仈goodsorder锛�")
private String ordreId;
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Refund.java b/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
index cee6f51..2e4bc77 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
@@ -82,14 +82,16 @@
@ApiModelProperty(value = "閫�娆炬柟寮� 0寰俊 1鏀粯瀹�", example = "1")
@ExcelColumn(name="閫�娆炬柟寮� 0寰俊 1鏀粯瀹�")
private Integer payWay;
-
+ @ApiModelProperty(value = "濂楅鍗￠��娆剧被鍨� 0閫�璐ч��娆� 1浠呴��娆�")
+ @ExcelColumn(name="濂楅鍗￠��娆剧被鍨� 0閫�璐ч��娆� 1浠呴��娆�")
+ private String discountType;
@ApiModelProperty(value = "瀹屾垚鏃堕棿")
@ExcelColumn(name="瀹屾垚鏃堕棿")
//@JsonFormat(pattern = "yyyy-MM-dd")
private Date doneDate;
- @ApiModelProperty(value = "閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 3缁撶畻鍚庨��娆�'", example = "1")
- @ExcelColumn(name="閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 3缁撶畻鍚庨��娆�'")
+ @ApiModelProperty(value = "閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 3缁撶畻鍚庨��娆� 4濂楅鍗￠��娆�'", example = "1")
+ @ExcelColumn(name="閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 4濂楅鍗￠��娆�'")
private Integer type;
@ApiModelProperty(value = "閫�娆剧被鍨� 0缁撶畻閫�娆� 1寮哄埗缁撶畻閫�娆� 2缁撶畻鍚庨��娆�", example = "1")
@TableField(exist = false)
@@ -114,6 +116,7 @@
private String payOnlineOrderid;
+
@ApiModelProperty(value = "浜ゆ槗绗旀暟", example = "0")
@TableField(exist = false)
private int countNum;
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Sites.java b/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
index 62a07ca..d3ab0e0 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
@@ -100,4 +100,7 @@
@ApiModelProperty(value = "鍥剧墖base64")
@TableField(exist = false)
private String base64;
+ @ApiModelProperty(value = "鐢靛瓙鍥存爮缁忕含搴﹂泦鍚� jsonb")
+ @TableField(exist = false)
+ private String electronicFence;
}
--
Gitblit v1.9.3