From dcff8ae4cd446921c85cc956a7e27bb715c3c582 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 九月 2024 11:39:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountVO.java |   85 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 85 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountVO.java
new file mode 100644
index 0000000..c03dc79
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountVO.java
@@ -0,0 +1,85 @@
+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 = "充电算帐单")
+public class AccountVO {
+    @ApiModelProperty(value = "账单编号")
+    private String code;
+    @ApiModelProperty(value = "账户类型")
+    private String accountType;
+    @ApiModelProperty(value = "账单类型")
+    private String orderType;
+    @ApiModelProperty(value = "账单分类")
+    private String type;
+//    @ApiModelProperty(value = "账单周期")
+//    private String accountType;
+//    @ApiModelProperty(value = "站点名称")
+//    private String accountType;
+//    @ApiModelProperty(value = "账户类型")
+//    private String accountType;
+//    @ApiModelProperty(value = "账户类型")
+//    private String accountType;
+//    @ApiModelProperty(value = "账户类型")
+//    private String accountType;
+//    @ApiModelProperty(value = "账户类型")
+//    private String accountType;
+//    @ApiModelProperty(value = "账户类型")
+//    private String accountType;
+//    @ApiModelProperty(value = "账户类型")
+//    private String accountType;
+//    @ApiModelProperty(value = "账户类型")
+//    private String accountType;
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//    @ApiModelProperty(value = "订单总金额")
+//    private BigDecimal orderAmount;
+//    @ApiModelProperty(value = "累计电费")
+//    private BigDecimal electrovalence;
+//    @ApiModelProperty(value = "累计服务费")
+//    private BigDecimal serviceCharge;
+//    @ApiModelProperty(value = "订单数量")
+//    private Integer orderCount;
+//    @ApiModelProperty(value = "平台手续费")
+//    private BigDecimal commissionAmount;
+//    @ApiModelProperty(value = "三方平台分佣")
+//    private BigDecimal sharingAmount;
+//    @ApiModelProperty(value = "优惠抵扣")
+//    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;
+
+}

--
Gitblit v1.7.1