From 00779ea0f8374e5bbdffc8faa20d65e3c72616c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 19:26:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 94 insertions(+), 10 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 9c48083..156e598 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
@@ -31,7 +31,12 @@
@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 +73,7 @@
@ApiModelProperty(value = "站点 id")
@TableField("site_id")
private Integer siteId;
+
@ApiModelProperty(value = "停车场id")
@TableField("parking_lot_id")
@@ -123,6 +129,10 @@
@TableField("recharge_serial_number")
private String rechargeSerialNumber;
+ @ApiModelProperty(value = "充电金额（传给硬件方的金额）")
+ @TableField("charge_amount")
+ private BigDecimal chargeAmount;
+
@ApiModelProperty(value = "剩余金额（用于前端展示）")
@TableField("residual_amount")
private BigDecimal residualAmount;
@@ -155,6 +165,13 @@
@TableField("refund_code")
private String refundCode;
+ @ApiModelProperty(value = "标题")
+ @TableField("title")
+ private String title;
+ @ApiModelProperty(value = "退款原因")
+ @TableField(exist = false)
+ private String refundReason;
+
@ApiModelProperty(value = "退款金额")
@TableField("refund_amount")
private BigDecimal refundAmount;
@@ -166,6 +183,18 @@
@ApiModelProperty(value = "累计电费")
@TableField("electrovalence")
private BigDecimal electrovalence;
+ @ApiModelProperty(value = "电流")
+ @TableField("current")
+ private BigDecimal current;
+ @ApiModelProperty(value = "电压")
+ @TableField("voltage")
+ private BigDecimal voltage;
+ @ApiModelProperty(value = "电量")
+ @TableField("electricity")
+ private BigDecimal electricity;
+ @ApiModelProperty(value = "功率")
+ @TableField("power")
+ private BigDecimal power;
@ApiModelProperty(value = "退款状态（1=退款中，2=退款成功）")
@TableField("refund_status")
@@ -179,18 +208,73 @@
@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;
@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;
+ @ApiModelProperty(value = "实时需求电流")
+ @TableField("need_elec")
+ private BigDecimal needElec;
+ @ApiModelProperty(value = "站点名称")
+ @TableField(exist = false)
+ private String siteName;
+ @ApiModelProperty(value = "终端名称")
+ @TableField(exist = false)
+ private String terminalName;
+ @ApiModelProperty(value = "终端编号")
+ @TableField(exist = false)
+ private String terminalCode;
+ @ApiModelProperty(value = "订单分类")
+ @TableField(exist = false)
+ private String orderClassification1;
+ @ApiModelProperty(value = "支付方式")
+ @TableField(exist = false)
+ private String rechargePaymentType1;
+ @ApiModelProperty(value = "支付平台")
+ @TableField(exist = false)
+ private String payPlatform;
+ @ApiModelProperty(value = "充电启动方式")
+ @TableField(exist = false)
+ private String chargingType;
+ @ApiModelProperty(value = "订单状态")
+ @TableField(exist = false)
+ private String status1;
+ @ApiModelProperty(value = "终端名称")
+ @TableField(exist = false)
+ private String endMode1;
+ @ApiModelProperty(value = "充电费用")
+ @TableField(exist = false)
+ private String totalAmount;
+ @ApiModelProperty(value = "合计")
+ @TableField(exist = false)
+ private BigDecimal total;
+ @ApiModelProperty(value = "优惠抵扣")
+ @TableField(exist = false)
+ private String discount;
+ @ApiModelProperty(value = "充电时长")
+ @TableField(exist = false)
+ private String chargingTime;
+ @ApiModelProperty(value = "充电后soc")
+ @TableField(exist = false)
+ private String endSoc;
+ @ApiModelProperty(value = "客户昵称")
+ @TableField(exist = false)
+ private String userName;
+ @ApiModelProperty(value = "手机号")
+ @TableField(exist = false)
+ private String phone;
+ @ApiModelProperty(value = "车牌号")
+ @TableField(exist = false)
+ private String licensePlate;
+ @ApiModelProperty(value = "车辆品牌")
+ @TableField(exist = false)
+ private String vehicleModel;
+
}
--
Gitblit v1.7.1