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/TCharingOrderVO.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderVO.java
index 5929188..df994ba 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderVO.java
@@ -22,4 +22,20 @@
private BigDecimal electronicMoney;
@ApiModelProperty(value = "服务费")
private BigDecimal serviceMoney;
+ @ApiModelProperty(value = "平台收入汇总")
+ private BigDecimal platformIncomeTotal;
+ @ApiModelProperty(value = "合作商收入汇总")
+ private BigDecimal partnerIncomeTotal;
+ @ApiModelProperty(value = "微信收入")
+ private BigDecimal wechatIncome;
+ @ApiModelProperty(value = "支付宝收入")
+ private BigDecimal alipayIncome;
+ @ApiModelProperty(value = "余额收入")
+ private BigDecimal balanceIncome;
+ @ApiModelProperty(value = "余额赠送")
+ private BigDecimal balanceGiftIncome;
+ @ApiModelProperty(value = "白名单充电收入")
+ private BigDecimal whitelistChargingIncome;
+ @ApiModelProperty(value = "白名单退款")
+ private BigDecimal whitelistRefund;
}
--
Gitblit v1.7.1