From e9d4746af2164d4dbff94bd7736b28072b44fc57 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 06 十一月 2024 17:28:18 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java
index 47c25c5..8fabc3d 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java
@@ -14,14 +14,21 @@
public class ChargingBillListVO extends TChargingBill {
@ApiModelProperty(value = "账单周期")
private String billWeek;
+ @ApiModelProperty(value = "账户类型名称")
+ private String payTypeName;
+
@ApiModelProperty(value = "充电时间 秒")
private Integer chargingSecond;
@ApiModelProperty(value = "订单数量")
private Integer orderCount;
@ApiModelProperty(value = "站点名称")
private String siteName;
- @ApiModelProperty(value = "实收金额")
+ @ApiModelProperty(value = "实收金额（支付结算金额）")
private BigDecimal paymentAmount;
+ @ApiModelProperty(value = "退款结算金额")
+ private BigDecimal refundAmount;
+ @ApiModelProperty(value = "平台分佣")
+ private BigDecimal sharingAmount;
@ApiModelProperty(value = "总金额")
private BigDecimal orderAmount;
@ApiModelProperty(value = "累计电费")
@@ -30,8 +37,8 @@
private BigDecimal serviceCharge;
@ApiModelProperty(value = "平台手续费")
private BigDecimal commissionAmount;
- @ApiModelProperty(value = "平台分佣")
- private BigDecimal sharingAmount;
@ApiModelProperty(value = "充电电流 度")
private BigDecimal chargingCapacity;
+ @ApiModelProperty(value = "入账金额")
+ private BigDecimal billMoney;
}
--
Gitblit v1.7.1