From b50e57bf7e17d696ddb4e9785c909052da034ef4 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期二, 14 七月 2026 09:10:47 +0800
Subject: [PATCH] Merge branch '2.1' into 2.3
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java | 8 ++++++++
1 files changed, 8 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 25092cd..e46ece6 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
@@ -38,6 +38,10 @@
private Integer chargingGunId;
@ApiModelProperty(value = "订单来源（1=自己平台，2=三方平台）")
private Integer orderSource;
+ @ApiModelProperty(value = "支付渠道来源")
+ private String sourceName;
+ @ApiModelProperty(value = "第三方支付流水号或工行订单号")
+ private String rechargeSerialNumber;
@ApiModelProperty(value = "是否白名单用户")
private Integer isWhitelist;
@ApiModelProperty(value = "白名单用户退款金额")
@@ -80,6 +84,10 @@
private BigDecimal balanceIncome;
@ApiModelProperty(value = "余额赠送收入")
private BigDecimal balanceGiftIncome;
+ @ApiModelProperty(value = "平台收入")
+ private BigDecimal platformIncome;
+ @ApiModelProperty(value = "合作商收入")
+ private BigDecimal partnerIncome;
@ApiModelProperty(value = "充电后剩余金额")
private BigDecimal residualAmount;
@ApiModelProperty(value = "累计电费")
--
Gitblit v1.7.1