From 1cb4ef53a80e600d03d6183bf9ac58fe5207aa0b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 30 八月 2024 17:05:02 +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/model/TChargingOrder.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 9f1178f..9351b4e 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -86,9 +86,13 @@
@TableField("end_time")
private LocalDateTime endTime;
- @ApiModelProperty(value = "状态（0=未知，1=等待中，2=启动中，3=充电中，4=停止中，5=已结束）")
+ @ApiModelProperty(value = "状态（0=未知，1=等待中/已插枪，2=启动中，3=充电中，4=停止中，5=已结束）")
@TableField("status")
private Integer status;
+
+ @ApiModelProperty(value = "结束方式（0=异常终止，1=主动终止，2=满电终止，3=费用不足终止）")
+ @TableField("end_mode")
+ private Integer endMode;
@ApiModelProperty(value = "充值金额")
@TableField("recharge_amount")
@@ -106,7 +110,7 @@
@TableField("recharge_serial_number")
private String rechargeSerialNumber;
- @ApiModelProperty(value = "订单金额")
+ @ApiModelProperty(value = "订单金额(总金额)")
@TableField("order_amount")
private BigDecimal orderAmount;
@@ -114,7 +118,7 @@
@TableField("app_coupon_id")
private Long appCouponId;
- @ApiModelProperty(value = "优惠金额")
+ @ApiModelProperty(value = "优惠券抵扣金额")
@TableField("coupon_discount_amount")
private BigDecimal couponDiscountAmount;
@@ -126,7 +130,7 @@
@TableField("vip_discount_amount")
private BigDecimal vipDiscountAmount;
- @ApiModelProperty(value = "支付金额")
+ @ApiModelProperty(value = "支付金额（实付）")
@TableField("payment_amount")
private BigDecimal paymentAmount;
@@ -151,4 +155,17 @@
@TableField("refund_time")
private LocalDateTime refundTime;
+
+ @ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("pay_time")
+ private LocalDateTime payTime;
+
+ @ApiModelProperty(value = "累计服务费")
+ @TableField("service_charge")
+ private BigDecimal serviceCharge;
+
+ @ApiModelProperty(value = "累计电费")
+ @TableField("electrovalence")
+ private BigDecimal electrovalence;
}
--
Gitblit v1.7.1