From bcff6cd41a09c5b3f5db68db8b9dbb2f90fb78f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 28 十月 2024 11:11:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 7bf9386..ba76c18 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
@@ -25,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")
@@ -47,6 +47,9 @@
@ApiModelProperty(value = "结算服务费备注")
@TableField("service_remark")
private String serviceRemark;
+ @ApiModelProperty(value = "电费结算方编码")
+ @TableField("confirm_code")
+ private String confirmCode;
@ApiModelProperty(value = "计量电量（电量合计）")
@TableField("metering_electronic")
@@ -58,7 +61,7 @@
@TableField("loss_electronic")
private BigDecimal lossElectronic;
@ApiModelProperty(value = "收入合计")
- @TableField("收入合计")
+ @TableField("income")
private BigDecimal income;
@ApiModelProperty(value = "场地费")
@@ -107,6 +110,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;
@@ -147,6 +156,9 @@
@ApiModelProperty(value = "站点名称")
@TableField(exist = false)
private String siteName;
+ @ApiModelProperty(value = "服务费:合计可分配金额")
+ @TableField(exist = false)
+ private String serviceChargeTotal;
@ApiModelProperty(value = "合作商名称")
@TableField(exist = false)
private String partnerName;
--
Gitblit v1.7.1