From ce56e6447c3a47a9d9408eb5205dd563aabe1a39 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 05 一月 2025 18:38:50 +0800
Subject: [PATCH] 修改计费bug
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 ba76c18..6ec0528 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
@@ -34,7 +34,12 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id")
private Long id;
-
+ @ApiModelProperty(value = "序号")
+ @TableField(exist = false)
+ private Integer xuhao;
+ @ApiModelProperty(value = "月份")
+ @TableField(exist = false)
+ private Integer month;
@ApiModelProperty(value = "站点id")
@TableField("site_id")
private Integer siteId;
@@ -101,6 +106,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;
@@ -186,4 +197,11 @@
@TableField(exist = false)
private Integer electronicRefund;
+ @ApiModelProperty(value = "下载权限")
+ @TableField(exist = false)
+ private boolean authDownLoad = true;
+
+ @ApiModelProperty(value = "删除权限")
+ @TableField(exist = false)
+ private boolean authDelete = true;
}
--
Gitblit v1.7.1