From 7a4f9541331bef779a506b38a27ed5c3373c0bec Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 15 五月 2025 13:53:22 +0800
Subject: [PATCH] 开发二级等保功能及心跳消息队列修改
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java
index c6d4056..b4913d0 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TChargingBill;
+import com.ruoyi.order.api.model.TChargingOrder;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -14,16 +15,20 @@
@ApiModel(value = "ChargingBillListVO对象",description = "充电算帐单列表VO")
public class AccountListVO{
@ApiModelProperty(value = "账单数量")
- private String billCount;
+ private Integer billCount;
@ApiModelProperty(value = "总入账金额")
private BigDecimal totalAmount;
@ApiModelProperty(value = "总支付结算金额")
private BigDecimal paymentAmount;
@ApiModelProperty(value = "总退款结算金额")
- private BigDecimal orderAmount;
+ private BigDecimal refundAmount;
@ApiModelProperty(value = "平台手续费")
private BigDecimal commissionAmount;
+ @ApiModelProperty(value = "分佣")
+ private BigDecimal sharingAmount;
@ApiModelProperty(value = "列表数据")
private PageInfo<ChargingBillListVO> list;
+ @ApiModelProperty(value = "导出数据")
+ private List<TChargingOrder> orderList;
}
--
Gitblit v1.7.1