From 6912e074af61b73307d2fc31b1b8f4974f5eb4f3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 22 五月 2026 10:17:31 +0800
Subject: [PATCH] Merge branch 'master' 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 | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 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 e63d3f6..25092cd 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
@@ -18,6 +18,8 @@
private Integer status;
@ApiModelProperty(value = "充值支付方式（1=微信，2=支付宝）")
private Integer rechargePaymentType;
+ @ApiModelProperty(value = "支付方式（1=余额支付，2=组合支付，3=第三方支付）")
+ private Integer payMethod;
@ApiModelProperty(value = "充值支付状态（1=待支付，2=已支付）")
private Integer rechargePaymentStatus;
@ApiModelProperty(value = "电站id")
@@ -36,6 +38,14 @@
private Integer chargingGunId;
@ApiModelProperty(value = "订单来源（1=自己平台，2=三方平台）")
private Integer orderSource;
+ @ApiModelProperty(value = "是否白名单用户")
+ private Integer isWhitelist;
+ @ApiModelProperty(value = "白名单用户退款金额")
+ private BigDecimal whitelistRefundAmount;
+ @ApiModelProperty(value = "白名单电费退款金额")
+ private BigDecimal whitelistElectricRefundAmount;
+ @ApiModelProperty(value = "白名单服务费退款金额")
+ private BigDecimal whitelistServiceRefundAmount;
@ApiModelProperty(value = "订单编号")
private String code;
@ApiModelProperty(value = "订单类型（1=充电订单（小程序），2=充电订单（刷卡））")
@@ -62,6 +72,14 @@
private String phone;
@ApiModelProperty(value = "充电到账金额")
private BigDecimal paymentAmount;
+ @ApiModelProperty(value = "现金支付金额")
+ private BigDecimal thirdPayAmount;
+ @ApiModelProperty(value = "余额支付金额")
+ private BigDecimal balancePayAmount;
+ @ApiModelProperty(value = "余额收入")
+ private BigDecimal balanceIncome;
+ @ApiModelProperty(value = "余额赠送收入")
+ private BigDecimal balanceGiftIncome;
@ApiModelProperty(value = "充电后剩余金额")
private BigDecimal residualAmount;
@ApiModelProperty(value = "累计电费")
--
Gitblit v1.7.1