From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java
index ab1c46f..2000729 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillVO.java
@@ -1,11 +1,13 @@
package com.ruoyi.order.api.vo;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.order.api.model.TChargingOrder;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
@Data
@ApiModel(value = "ChargingBillVO对象",description = "充电算帐单")
@@ -16,6 +18,8 @@
private BigDecimal paymentAmount;
@ApiModelProperty(value = "订单总金额")
private BigDecimal orderAmount;
+ @ApiModelProperty(value = "总退款金额")
+ private BigDecimal refundAmount;
@ApiModelProperty(value = "累计电费")
private BigDecimal electrovalence;
@ApiModelProperty(value = "累计服务费")
@@ -23,11 +27,27 @@
@ApiModelProperty(value = "订单数量")
private Integer orderCount;
@ApiModelProperty(value = "平台手续费")
- private String commissionAmount;
+ private BigDecimal commissionAmount;
@ApiModelProperty(value = "三方平台分佣")
- private String sharingAmount;
+ private BigDecimal sharingAmount;
@ApiModelProperty(value = "优惠抵扣")
- private String discount;
+ private BigDecimal discount;
+ @ApiModelProperty(value = "账单分类 1全站 2各个站点 前端忽略")
+ private String category;
+ @ApiModelProperty(value = "账单类型 月结 前端忽略")
+ private String type;
+ @ApiModelProperty(value = "站点名称 前端忽略")
+ private String siteName;
+ @ApiModelProperty(value = "账单周期 前端忽略")
+ private String billWeek;
+ @ApiModelProperty(value = "账单生成日期 前端忽略")
+ private String createTime;
+ @ApiModelProperty(value = "账单编号 前端忽略")
+ private String code;
+ @ApiModelProperty(value = "充电时长 前端忽略")
+ private String chargingTime;
@ApiModelProperty(value = "列表数据")
- private PageInfo<ChargingOrderListVO> list;
+ private PageInfo<ChargingBillListVO> list;
+ @ApiModelProperty(value = "导出Excel数据 前端忽略")
+ private List<TChargingOrder> exportList;
}
--
Gitblit v1.7.1