From 280cf0d1e6b956c4e6c0ed8d65ab28a8a18fa961 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 02 十一月 2024 15:04:43 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java | 75 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 31 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 5416fdb..3154e54 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
@@ -13,6 +13,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -24,14 +25,14 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@TableName("t_settlement confirm")
+@TableName("t_settlement_confirm")
@ApiModel(value="TSettlementConfirm对象", description="")
public class TSettlementConfirm extends BasePojo {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id")
private Long id;
@ApiModelProperty(value = "站点id")
@@ -46,6 +47,9 @@
@ApiModelProperty(value = "结算服务费备注")
@TableField("service_remark")
private String serviceRemark;
+ @ApiModelProperty(value = "电费结算方编码")
+ @TableField("confirm_code")
+ private String confirmCode;
@ApiModelProperty(value = "计量电量（电量合计）")
@TableField("metering_electronic")
@@ -59,6 +63,7 @@
@ApiModelProperty(value = "收入合计")
@TableField("income")
private BigDecimal income;
+
@ApiModelProperty(value = "场地费")
@TableField("venue")
private BigDecimal venue;
@@ -71,9 +76,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;
@@ -93,6 +101,12 @@
@ApiModelProperty(value = "承担金额")
@TableField("proportion_money")
private BigDecimal proportionMoney;
+ @ApiModelProperty(value = "合作商充电服务费根据合同约定分成比例")
+ @TableField(exist = false)
+ private String proportionPartnerString;
+ @ApiModelProperty(value = "平台充电服务费根据合同约定分成比例")
+ @TableField(exist = false)
+ private String proportionMoneyString;
@ApiModelProperty(value = "本期结算电费总金额 （实际电费转账）")
@TableField("total_electronic")
private BigDecimal totalElectronic;
@@ -102,6 +116,12 @@
@ApiModelProperty(value = "合作商充电服务费根据合同约定分成比例")
@TableField("service_partner")
private BigDecimal servicePartner;
+ @ApiModelProperty(value = "合作商充电服务费根据合同约定分成比例")
+ @TableField(exist = false)
+ private String servicePartnerString;
+ @ApiModelProperty(value = "平台充电服务费根据合同约定分成比例")
+ @TableField(exist = false)
+ private String platformString;
@ApiModelProperty(value = "合作商充电服务费根据合同约定分成金额")
@TableField("service_money")
private BigDecimal serviceMoney;
@@ -128,43 +148,23 @@
@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)
private String siteName;
+ @ApiModelProperty(value = "服务费:合计可分配金额")
+ @TableField(exist = false)
+ private String serviceChargeTotal;
@ApiModelProperty(value = "合作商名称")
@TableField(exist = false)
private String partnerName;
@@ -172,11 +172,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