From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java | 113 ++++++++++++++++++++++++--------------------------------
1 files changed, 48 insertions(+), 65 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 3df5f90..7e08143 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,139 @@
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 = "鐢ㄦ埛OpenId")
+ @ExcelColumn(name="鐢ㄦ埛",index = 1,width = 10,align = HorizontalAlignment.CENTER)
+ @TableField(exist = false)
+ private String memberOpenid;
+
+
@ApiModelProperty(value = "杞﹁締缂栫爜")
- @ExcelColumn(name="杞﹁締缂栫爜")
+ @ExcelColumn(name="杞﹁締缂栫爜",index = 2,width = 10,align = HorizontalAlignment.CENTER)
private String bikeCode;
- @ApiModelProperty(value = "褰撳墠璐︽埛浣欓", example = "1")
- @ExcelColumn(name="褰撳墠璐︽埛浣欓")
+ @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寮�閿佸け璐�")
+ 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姝ｅ父杩樿溅 1寮哄埗杩樿溅", example = "1")
- @ExcelColumn(name="杩樿溅绫诲瀷 0姝ｅ父杩樿溅 1寮哄埗杩樿溅")
+ @ApiModelProperty(value = "杩樿溅绫诲瀷 0姝ｅ父杩樿溅 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 = "鎺掑簭鐮侊紙鍗囧簭锛�", example = "1")
+ @TableField(exist = false)
+ private Integer sortnum;
+
}
--
Gitblit v1.9.3