From 95cd9efed9c2861b0d266530eaec0666013ece10 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 20 三月 2025 17:41:03 +0800
Subject: [PATCH] 修改报表bug

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 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 156e598..29b0a51 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,10 +27,17 @@
 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 String idStr;
     @ApiModelProperty(value = "序号")
     @TableField(exist = false)
     private Integer xuhao;
@@ -44,9 +51,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")
@@ -69,6 +85,10 @@
     @ApiModelProperty(value = "充电车辆 id")
     @TableField("app_user_car_id")
     private Long appUserCarId;
+
+    @ApiModelProperty(value = "充电车辆车牌号")
+    @TableField("plate_num")
+    private String plateNum;
 
     @ApiModelProperty(value = "站点 id")
     @TableField("site_id")
@@ -276,5 +296,8 @@
     @ApiModelProperty(value = "车辆品牌")
     @TableField(exist = false)
     private String vehicleModel;
+    @ApiModelProperty(value = "时段数")
+    @TableField(exist = false)
+    private Long timeFrame;
 
 }

--
Gitblit v1.7.1