From 4fd0278cda787a91eb35d95d6491f5485afe3e48 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期六, 07 九月 2024 18:03:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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..796d4a9 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;
@@ -173,14 +177,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