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/web/response/MemberRidesResponse.java | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 deletions(-) diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java index 83fc050..a9fb0b5 100644 --- a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java +++ b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; +import com.doumee.dao.business.model.DiscountMember; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -29,11 +30,20 @@ @ApiModelProperty(value = "楠戣缁撴潫鏃堕棿") private Date rideEndTime; + @ApiModelProperty(value = "楠戣寮�濮嬫椂闂�-鐭椂闂�") + private String rideStartTimeStr; + + @ApiModelProperty(value = "楠戣缁撴潫鏃堕棿-鐭椂闂�") + private String rideEndTimeStr; + @ApiModelProperty(value = "楠戣鏃堕暱") - private long rideTime; + private Integer rideTime; @ApiModelProperty(value = "璁¤垂鏃堕暱") - private long duration; + private Integer duration; + + @ApiModelProperty(value = "璁′环瑙勫垯") + private String priceRole; @ApiModelProperty(value = "杞﹀瀷") private String bikeType; @@ -41,15 +51,28 @@ @ApiModelProperty(value = "缂栧彿") private String bikeCode; + @ApiModelProperty(value = "璁㈠崟绫诲瀷锛�0=鑷杞﹁鍗曪紱1=鐢佃溅璁㈠崟") + private Integer ridesType; + + @ApiModelProperty(value = "鐢甸噺鐘舵�侊細0=鐢甸噺鍏呰冻锛�1=鐢甸噺浣�") + private Integer voltageStatus; + @ApiModelProperty(value = "璧锋浠�", example = "1") private BigDecimal basePrice; @ApiModelProperty(value = "璧锋浠锋椂闂�", example = "1") private Integer baseTime; - @ApiModelProperty(value = "瓒呭嚭鍗曚环", example = "1") - private Integer unitPrice; + @ApiModelProperty(value = "瓒呭嚭鍗曚环") + private BigDecimal unitPrice; - @ApiModelProperty(value = "瓒呭嚭鏃堕棿鍗曚綅", example = "1") + @ApiModelProperty(value = "瓒呭嚭鏃堕棿鍗曚綅") private Integer unitTime; + + @ApiModelProperty(value = "楠戣璁板綍涓婚敭") + private String rideId; + + @ApiModelProperty(value = "濂楅鍗′俊鎭�") + private DiscountMember discountMember; + } -- Gitblit v1.9.3