From a71bf51568cbee157df2cc3bd0348002f2400410 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 11 九月 2024 14:58:11 +0800
Subject: [PATCH] 代码提交
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java | 51 +++++++++++++++++++++------------------------------
1 files changed, 21 insertions(+), 30 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java
index 354868a..7bf9386 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java
@@ -58,8 +58,9 @@
@TableField("loss_electronic")
private BigDecimal lossElectronic;
@ApiModelProperty(value = "收入合计")
- @TableField("income")
+ @TableField("收入合计")
private BigDecimal income;
+
@ApiModelProperty(value = "场地费")
@TableField("venue")
private BigDecimal venue;
@@ -72,9 +73,12 @@
@ApiModelProperty(value = "日常维护费")
@TableField("maintain")
private BigDecimal maintain;
- @ApiModelProperty(value = "成本（可分配合计）")
+ @ApiModelProperty(value = "成本")
@TableField("cost")
private BigDecimal cost;
+ @ApiModelProperty(value = "合计可分配金额")
+ @TableField("distribution")
+ private BigDecimal distribution;
@ApiModelProperty(value = "利润")
@TableField("profit_money")
private BigDecimal profitMoney;
@@ -129,39 +133,16 @@
@TableField("coupon_discount")
private BigDecimal couponDiscount;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@ApiModelProperty(value = "类型（1=开始，2=结束）")
@TableField("type")
private Integer type;
@ApiModelProperty(value = "开始时间")
@TableField("start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
@TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime endTime;
@ApiModelProperty(value = "站点名称")
@TableField(exist = false)
@@ -173,14 +154,24 @@
@ApiModelProperty(value = "uid")
@TableField(exist = false)
private String uid;
- @ApiModelProperty(value = "合计可分配金额")
- @TableField(exist = false)
- private BigDecimal distribution;
+
@ApiModelProperty(value = "结账日期 2024年09月06日17:10:06至2024年09月06日17:10:06")
@TableField(exist = false)
private String time;
@ApiModelProperty(value = "充电记录明细")
@TableField(exist = false)
private List<TChargingOrder> list;
+ @ApiModelProperty(value = "收入合计涨幅/跌幅 正数为涨幅负数为跌幅 字段为空 说明没有上月记录 不展示涨幅跌幅")
+ @TableField(exist = false)
+ private String incomePercentage;
+ @ApiModelProperty(value = "总利润涨幅/跌幅 正数为涨幅负数为跌幅 字段为空 说明没有上月记录 不展示涨幅跌幅")
+ @TableField(exist = false)
+ private String totalPercentage;
+ @ApiModelProperty(value = "利用率")
+ @TableField(exist = false)
+ private String rate;
+ @ApiModelProperty(value = "参与电力市场交易退补电费")
+ @TableField(exist = false)
+ private Integer electronicRefund;
}
--
Gitblit v1.7.1