From e46db188efe1fb54f7617426bd6cef6deb076009 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 21 三月 2025 15:35:22 +0800
Subject: [PATCH] 充电桩bug修改
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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..30cc8bd 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;
@@ -39,9 +48,18 @@
@ApiModelProperty(value = "订单类型（1=充电订单（小程序），2=充电订单（刷卡））")
@TableField("order_type")
private Integer orderType;
- @ApiModelProperty(value = "0平台1其他")
+ @ApiModelProperty(value = "订单来源（1=自己平台，2=三方平台）")
@TableField("order_source")
private Integer orderSource;
+ @ApiModelProperty(value = "运营商id")
+ @TableField("operator_id")
+ private Integer operatorId;
+ @ApiModelProperty(value = "三方平台名称")
+ @TableField("tripartite_platform_name")
+ private String tripartitePlatformName;
+ @ApiModelProperty(value = "三方平台充电订单号")
+ @TableField("start_charge_seq")
+ private String startChargeSeq;
@ApiModelProperty(value = "平台或其他第三分名字")
@TableField("source_name")
@@ -65,9 +83,14 @@
@TableField("app_user_car_id")
private Long appUserCarId;
+ @ApiModelProperty(value = "充电车辆车牌号")
+ @TableField("plate_num")
+ private String plateNum;
+
@ApiModelProperty(value = "站点 id")
@TableField("site_id")
private Integer siteId;
+
@ApiModelProperty(value = "停车场id")
@TableField("parking_lot_id")
@@ -202,6 +225,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 +254,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 +269,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