From 3053622a190f1ed98a1fdd5ce998f9bda5cc7e87 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 七月 2025 18:20:38 +0800
Subject: [PATCH] Merge branch 'dev' 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/vo/ChargingOrderListVO.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
index 5d8d476..073682b 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
@@ -14,7 +14,6 @@
public class ChargingOrderListVO {
@ApiModelProperty(value = "电站名称")
private String siteName;
-
@ApiModelProperty(value = "订单状态")
private Integer status;
@ApiModelProperty(value = "充值支付方式（1=微信，2=支付宝）")
@@ -49,10 +48,14 @@
private BigDecimal chargingCapacity;
@ApiModelProperty(value = "充电电流 度")
private BigDecimal electricity;
+ @ApiModelProperty(value = "充电支付金额")
+ private BigDecimal rechargeAmount;
@ApiModelProperty(value = "充电到账金额")
private BigDecimal orderAmount;
@ApiModelProperty(value = "会员抵扣金额")
private BigDecimal vipDiscountAmount;
+ @ApiModelProperty(value = "退款金额")
+ private BigDecimal refundAmount;
@ApiModelProperty(value = "车牌号")
private String licensePlate;
@ApiModelProperty(value = "客户手机号")
@@ -67,10 +70,8 @@
private BigDecimal serviceCharge;
@ApiModelProperty(value = "平台手续费")
private BigDecimal commissionAmount;
- @ApiModelProperty(value = "平台手续费")
- private BigDecimal rechargeAmount;
@ApiModelProperty(value = "引流平台")
- private String sourceName;
+ private String tripartitePlatformName;
@ApiModelProperty(value = "平台分佣")
private BigDecimal sharingAmount;
@ApiModelProperty(value = "开始时间")
--
Gitblit v1.7.1