From a16c9bebf9ab97e04afa67db1665549af86948fb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 07 二月 2025 17:02:30 +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 | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 c029cb1..2562032 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
@@ -27,11 +27,20 @@
public class TChargingOrder extends BasePojo {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "累计退款金额 前端忽略")
+ @TableField(exist = false)
+
+ private BigDecimal refundAmount1;
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.NONE)
private Long id;
-
+ @ApiModelProperty(value = "序号")
+ @TableField(exist = false)
+ private Integer xuhao;
+ @ApiModelProperty(value = "退款描述")
+ @TableField(exist = false)
+ private String refundContent;
@ApiModelProperty(value = "订单编号")
@TableField("code")
private String code;
@@ -68,6 +77,7 @@
@ApiModelProperty(value = "站点 id")
@TableField("site_id")
private Integer siteId;
+
@ApiModelProperty(value = "停车场id")
@TableField("parking_lot_id")
@@ -202,6 +212,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("refund_time")
private LocalDateTime refundTime;
+ @ApiModelProperty(value = "退款成功时间")
+ @TableField(exist = false)
+ private String refundTime1;
@ApiModelProperty(value = "总电量")
@TableField("total_electricity")
private BigDecimal totalElectricity;
@@ -228,6 +241,9 @@
@ApiModelProperty(value = "支付方式")
@TableField(exist = false)
private String rechargePaymentType1;
+ @ApiModelProperty(value = "支付平台")
+ @TableField(exist = false)
+ private String payPlatform;
@ApiModelProperty(value = "充电启动方式")
@TableField(exist = false)
private String chargingType;
@@ -240,6 +256,9 @@
@ApiModelProperty(value = "充电费用")
@TableField(exist = false)
private String totalAmount;
+ @ApiModelProperty(value = "合计")
+ @TableField(exist = false)
+ private BigDecimal total;
@ApiModelProperty(value = "优惠抵扣")
@TableField(exist = false)
private String discount;
--
Gitblit v1.7.1