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/MemberRides.java |  131 +++++++++++++++++++++----------------------
 1 files changed, 64 insertions(+), 67 deletions(-)

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 816c03d..3728dac 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
@@ -1,13 +1,13 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.doumee.core.annotation.excel.ExcelColumn;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+
 import java.util.Date;
 import java.math.BigDecimal;
 
@@ -22,156 +22,153 @@
 public class MemberRides {
 
     @ApiModelProperty(value = "缂栫爜")
-    @ExcelColumn(name="缂栫爜")
     private String id;
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
-    @ExcelColumn(name="鍒涘缓鏃堕棿")
-    //@JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "鍒涘缓浜�")
-    @ExcelColumn(name="鍒涘缓浜�")
     private String creator;
 
     @ApiModelProperty(value = "缂栬緫鏃堕棿")
-    @ExcelColumn(name="缂栬緫鏃堕棿")
-    //@JsonFormat(pattern = "yyyy-MM-dd")
     private Date editDate;
 
     @ApiModelProperty(value = "缂栬緫浜�")
-    @ExcelColumn(name="缂栬緫浜�")
     private String editor;
 
-    @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
-    @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
+    @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
     private Integer isdeleted;
 
     @ApiModelProperty(value = "澶囨敞")
-    @ExcelColumn(name="澶囨敞")
     private String info;
 
     @ApiModelProperty(value = "鐢ㄦ埛缂栫爜")
-    @ExcelColumn(name="鐢ㄦ埛缂栫爜")
     private String memberId;
 
-    @ApiModelProperty(value = "杞﹁締缂栫爜")
-    @ExcelColumn(name="杞﹁締缂栫爜")
-    private String bikeCode;
+    @ApiModelProperty(value = "鐢ㄦ埛OpenId")
+    @ExcelColumn(name="鐢ㄦ埛",index = 1,width = 10,align = HorizontalAlignment.CENTER)
+    @TableField(exist = false)
+    private String memberOpenid;
 
-    @ApiModelProperty(value = "褰撳墠璐︽埛浣欓", example = "1")
-    @ExcelColumn(name="褰撳墠璐︽埛浣欓")
+    @ApiModelProperty(value = "杞﹁締绫诲瀷 0鑷杞� 1鐢佃溅")
+    @ExcelColumn(name="杞﹁締绫诲瀷 0鑷杞� 1鐢佃溅")
+    private Integer type;
+    @ApiModelProperty(value = "杞﹁締缂栫爜")
+    @ExcelColumn(name="杞﹁締缂栫爜",index = 2,width = 10,align = HorizontalAlignment.CENTER)
+    private String bikeCode;
+    @ApiModelProperty(value = "濂楅鍗℃姷鎵f椂闀匡紙鍒嗛挓锛�")
+    @ExcelColumn(name="濂楅鍗℃姷鎵f椂闀匡紙鍒嗛挓锛�",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;
 
     @ApiModelProperty(value = "杞﹁締绫诲瀷缂栫爜")
-    @ExcelColumn(name="杞﹁締绫诲瀷缂栫爜")
     private String paramId;
 
+    @ApiModelProperty(value = "杞﹁締绫诲瀷鍚嶇О")
+    @ExcelColumn(name="杞﹁締绫诲瀷",index = 3,width = 10,align = HorizontalAlignment.CENTER)
+    @TableField(exist = false)
+    private String paramName;
+
     @ApiModelProperty(value = "绉熻溅绔欑偣缂栫爜")
-    @ExcelColumn(name="绉熻溅绔欑偣缂栫爜")
+    @ExcelColumn(name="绉熻溅绔欑偣",index = 4,width = 10,align = HorizontalAlignment.CENTER)
     private String rentSiteId;
 
     @ApiModelProperty(value = "绉熻溅閿佸ご缂栫爜")
-    @ExcelColumn(name="绉熻溅閿佸ご缂栫爜")
-    private String rentLockId;
+    @ExcelColumn(name="绉熻溅閿佸叿",index = 5,width = 10,align = HorizontalAlignment.CENTER)
+    private Integer rentLockId;
 
     @ApiModelProperty(value = "绉熻溅鏃堕棿")
-    @ExcelColumn(name="绉熻溅鏃堕棿")
-    //@JsonFormat(pattern = "yyyy-MM-dd")
+    @ExcelColumn(name="绉熻溅鏃堕棿",index = 6,width = 10,align = HorizontalAlignment.CENTER)
     private Date rentDate;
 
     @ApiModelProperty(value = "绉熻溅鎸囦护缂栫爜")
-    @ExcelColumn(name="绉熻溅鎸囦护缂栫爜")
     private String rentCommondD;
 
     @ApiModelProperty(value = "杩樿溅绔欑偣缂栫爜")
-    @ExcelColumn(name="杩樿溅绔欑偣缂栫爜")
+    @ExcelColumn(name="褰掕繕绔欑偣",index = 7,width = 10,align = HorizontalAlignment.CENTER)
     private String backSiteId;
 
     @ApiModelProperty(value = "杩樿溅閿佸ご缂栫爜")
-    @ExcelColumn(name="杩樿溅閿佸ご缂栫爜")
-    private String backLockId;
+    @ExcelColumn(name="褰掕繕閿佸叿",index = 8,width = 10,align = HorizontalAlignment.CENTER)
+    private Integer backLockId;
 
     @ApiModelProperty(value = "杩樿溅鏃堕棿")
-    @ExcelColumn(name="杩樿溅鏃堕棿")
-    //@JsonFormat(pattern = "yyyy-MM-dd")
     private Date backDate;
 
     @ApiModelProperty(value = "杩樿溅鎸囦护缂栫爜")
-    @ExcelColumn(name="杩樿溅鎸囦护缂栫爜")
     private String backCommondId;
 
-    @ApiModelProperty(value = "璧锋浠�", example = "1")
-    @ExcelColumn(name="璧锋浠�")
+    @ApiModelProperty(value = "璧锋浠�")
     private BigDecimal basePrice;
 
-    @ApiModelProperty(value = "璧锋浠锋椂闂�", example = "1")
-    @ExcelColumn(name="璧锋浠锋椂闂�")
+    @ApiModelProperty(value = "璧锋浠锋椂闂�")
     private Integer baseTime;
 
-    @ApiModelProperty(value = "瓒呭嚭鍗曚环", example = "1")
-    @ExcelColumn(name="瓒呭嚭鍗曚环")
-    private Integer unitPrice;
+    @ApiModelProperty(value = "瓒呭嚭鍗曚环")
+    private BigDecimal unitPrice;
 
-    @ApiModelProperty(value = "瓒呭嚭鏃堕棿鍗曚綅", example = "1")
-    @ExcelColumn(name="瓒呭嚭鏃堕棿鍗曚綅")
+    @ApiModelProperty(value = "瓒呭嚭鏃堕棿鍗曚綅")
     private Integer unitTime;
 
-    @ApiModelProperty(value = "楠戣浠锋牸", example = "1")
-    @ExcelColumn(name="楠戣浠锋牸")
+    @ApiModelProperty(value = "楠戣浠锋牸")
     private BigDecimal price;
 
-    @ApiModelProperty(value = "楠戣瀹為檯浠锋牸", example = "1")
-    @ExcelColumn(name="楠戣瀹為檯浠锋牸")
+    @ApiModelProperty(value = "楠戣瀹為檯浠锋牸")
     private BigDecimal actualPrice;
 
-    @ApiModelProperty(value = "楠戣璁¤垂鏃堕暱", example = "1")
-    @ExcelColumn(name="楠戣璁¤垂鏃堕暱")
+    @ApiModelProperty(value = "楠戣璁¤垂鏃堕暱")
+//    @ExcelColumn(name="楠戣璁¤垂鏃堕暱",index = 1,width = 10,align = HorizontalAlignment.CENTER)
     private Integer duration;
 
     @ApiModelProperty(value = "缁撶畻鏃堕棿")
-    @ExcelColumn(name="缁撶畻鏃堕棿")
-    //@JsonFormat(pattern = "yyyy-MM-dd")
     private Date closeDate;
 
-    @ApiModelProperty(value = "缁撶畻鐘舵�� 0鏈粨绠� 1宸茬粨鏉�", example = "1")
-    @ExcelColumn(name="缁撶畻鐘舵�� 0鏈粨绠� 1宸茬粨鏉�")
+    @ApiModelProperty(value = "缁撶畻鐘舵�� 0鏈粨绠� 1宸茬粨鏉�")
     private Integer closeStatus;
 
+    @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞�  3寮�閿佸け璐� 4涓存椂閿佽溅")
+    private Integer status;
     @ApiModelProperty(value = "鍏宠仈璁㈠崟缂栫爜(鍏宠仈goodsorder锛�")
-    @ExcelColumn(name="鍏宠仈璁㈠崟缂栫爜(鍏宠仈goodsorder锛�")
     private String ordreId;
 
-    @ApiModelProperty(value = "鏄惁缁撶畻璁¤垂杞﹀瀷 0鍚� 1鏄�", example = "1")
-    @ExcelColumn(name="鏄惁缁撶畻璁¤垂杞﹀瀷 0鍚� 1鏄�")
+    @ApiModelProperty(value = "鏄惁缁撶畻璁¤垂杞﹀瀷 0鍚� 1鏄�")
     private Integer isStandard;
 
     @ApiModelProperty(value = "璁′环鏂规缂栫爜(鍏宠仈pricing_detail)")
-    @ExcelColumn(name="璁′环鏂规缂栫爜(鍏宠仈pricing_detail)")
     private String pricingDetailId;
 
     @ApiModelProperty(value = "鏄惁鑺傚亣鏃� 0涓嶆槸 1鏄�")
-    @ExcelColumn(name="鏄惁鑺傚亣鏃� 0涓嶆槸 1鏄�")
-    private String isHoliday;
+    private Integer isHoliday;
 
-    @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞�  3寮�閿佸け璐�", example = "1")
-    @ExcelColumn(name="鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞�  3寮�閿佸け璐�")
-    private Integer status;
 
-    @ApiModelProperty(value = "杩樿溅绫诲瀷 0姝e父杩樿溅 1寮哄埗杩樿溅", example = "1")
-    @ExcelColumn(name="杩樿溅绫诲瀷 0姝e父杩樿溅 1寮哄埗杩樿溅")
+    @ApiModelProperty(value = "杩樿溅绫诲瀷 0姝e父杩樿溅 1寮哄埗杩樿溅")
     private Integer backType;
 
-    @ApiModelProperty(value = "杩樿溅鍘熷洜")
-    @ExcelColumn(name="杩樿溅鍘熷洜")
+    @ApiModelProperty(value = "杩樿溅鍘熷洜(鍑忓厤鏃堕暱鍘熷洜涔熶娇鐢ㄨ鍙傛暟浼犲��)")
     private String backReason;
 
-    @ApiModelProperty(value = "杩樿溅澶囨敞")
-    @ExcelColumn(name="杩樿溅澶囨敞")
+    @ApiModelProperty(value = "杩樿溅澶囨敞(鍑忓厤鏃堕暱澶囨敞涔熶娇鐢ㄨ鍙傛暟浼犲��)")
     private String backInfo;
 
     @ApiModelProperty(value = "寮哄埗杩樿溅鎿嶄綔浜�(鍏宠仈system_user)")
-    @ExcelColumn(name="寮哄埗杩樿溅鎿嶄綔浜�(鍏宠仈system_user)")
     private String backUserid;
 
+    @ApiModelProperty(value = "楠戣鏃堕暱")
+    @TableField(exist = false)
+    private Integer rideTime;
+    @ApiModelProperty(value = "鎺у埗鍣ㄧ紪鐮�")
+    @TableField(exist = false)
+    private String deviceSn;
+    @ApiModelProperty(value = "鎺掑簭鐮侊紙鍗囧簭锛�", example = "1")
+    @TableField(exist = false)
+    private Integer sortnum;
+
 }

--
Gitblit v1.9.3