From 2c51f96fd55949db562fd0ef608b55ccb1530a1e Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期日, 03 十一月 2024 18:38:05 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java index 57bc9ba..1c7c508 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java @@ -14,8 +14,13 @@ public class ChargingOrderListVO { @ApiModelProperty(value = "电站名称") private String siteName; + @ApiModelProperty(value = "订单状态") private Integer status; + @ApiModelProperty(value = "充值支付方式(1=微信,2=支付宝)") + private Integer rechargePaymentType; + @ApiModelProperty(value = "充值支付状态(1=待支付,2=已支付)") + private Integer rechargePaymentStatus; @ApiModelProperty(value = "电站id") private Integer siteId; @ApiModelProperty(value = "充电桩id") @@ -40,6 +45,8 @@ private BigDecimal electricity; @ApiModelProperty(value = "充电到账金额") private BigDecimal orderAmount; + @ApiModelProperty(value = "会员抵扣金额") + private BigDecimal vipDiscountAmount; @ApiModelProperty(value = "车牌号") private String licensePlate; @ApiModelProperty(value = "客户手机号") @@ -61,6 +68,11 @@ @ApiModelProperty(value = "开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime startTime; + @ApiModelProperty(value = "最后支付时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime payTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime createTime; @ApiModelProperty(value = "结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime endTime; -- Gitblit v1.7.1