From dcff8ae4cd446921c85cc956a7e27bb715c3c582 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 九月 2024 11:39:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java | 8 +++++---
1 files changed, 5 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..78139c6 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
@@ -20,8 +20,12 @@
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 +34,6 @@
private BigDecimal serviceCharge;
@ApiModelProperty(value = "平台手续费")
private BigDecimal commissionAmount;
- @ApiModelProperty(value = "平台分佣")
- private BigDecimal sharingAmount;
@ApiModelProperty(value = "充电电流 度")
private BigDecimal chargingCapacity;
}
--
Gitblit v1.7.1