From 8837ca248ca273fb5703de02c6842b73e1d230f8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 九月 2024 18:26:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/dto/SettlementConfirmAdd.java | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 109 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/dto/SettlementConfirmAdd.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/dto/SettlementConfirmAdd.java
index fe67ee4..bb8ac0e 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/dto/SettlementConfirmAdd.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/dto/SettlementConfirmAdd.java
@@ -1,11 +1,18 @@
package com.ruoyi.order.api.dto;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.page.BasePage;
+import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TSettlementConfirm;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.List;
@Data
@@ -21,6 +28,106 @@
private String endTime;
@ApiModelProperty(value = "点击去生成 传1 填完表格数据点击保存 传2")
private Integer state;
- @ApiModelProperty(value = "保存的数据")
- private TSettlementConfirm data;
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+
+ @ApiModelProperty(value = "合作商id")
+ private Integer partnerId;
+ @ApiModelProperty(value = "结算电费备注")
+ private String remark;
+ @ApiModelProperty(value = "结算服务费备注")
+ private String serviceRemark;
+
+ @ApiModelProperty(value = "计量电量（电量合计）")
+ private BigDecimal meteringElectronic;
+ @ApiModelProperty(value = "充电电量")
+ private BigDecimal chargingElectronic;
+ @ApiModelProperty(value = "电损电量")
+ private BigDecimal lossElectronic;
+ @ApiModelProperty(value = "收入合计")
+ private BigDecimal income;
+
+ @ApiModelProperty(value = "场地费")
+ private BigDecimal venue;
+ @ApiModelProperty(value = "计量电费")
+ private BigDecimal metering;
+ @ApiModelProperty(value = "清洁费")
+ private BigDecimal clean;
+ @ApiModelProperty(value = "日常维护费")
+ private BigDecimal maintain;
+ @ApiModelProperty(value = "成本")
+ private BigDecimal cost;
+ @ApiModelProperty(value = "合计可分配金额")
+ private BigDecimal distribution;
+ @ApiModelProperty(value = "利润")
+ private BigDecimal profitMoney;
+ @ApiModelProperty(value = "新能源利润")
+ private BigDecimal newMoney;
+ @ApiModelProperty(value = "新能源结算金额")
+ private BigDecimal newSettlement;
+
+ @ApiModelProperty(value = "供电局结算电费")
+ private BigDecimal supplyElectronic;
+ @ApiModelProperty(value = "合作商承担电损占比")
+ private BigDecimal proportionPartner;
+ @ApiModelProperty(value = "承担金额")
+ private BigDecimal proportionMoney;
+ @ApiModelProperty(value = "本期结算电费总金额 （实际电费转账）")
+ private BigDecimal totalElectronic;
+ @ApiModelProperty(value = "本期结算服务费总金额（实际服务费转账）")
+ private BigDecimal totalService;
+ @ApiModelProperty(value = "合作商充电服务费根据合同约定分成比例")
+ private BigDecimal servicePartner;
+ @ApiModelProperty(value = "合作商充电服务费根据合同约定分成金额")
+ private BigDecimal serviceMoney;
+
+ @ApiModelProperty(value = "三方收费（合计三方平台收费）")
+ private BigDecimal sharingAmount;
+ @ApiModelProperty(value = " 交易手续费 三方收费*0.06%")
+ private BigDecimal commissionAmount;
+ @ApiModelProperty(value = "充电电费计费(平台合计电费)")
+ private BigDecimal electrovalence;
+ @ApiModelProperty(value = "充电服务费计费（实收服务费）")
+ private BigDecimal serviceCharge;
+ @ApiModelProperty(value = "交易手续费计费")
+ private BigDecimal orderCommission;
+ @ApiModelProperty(value = "会员抵扣")
+ private BigDecimal vipDiscount;
+ @ApiModelProperty(value = "优惠券抵扣")
+ private BigDecimal couponDiscount;
+
+// @ApiModelProperty(value = "类型（1=开始，2=结束）")
+// @TableField("type")
+// private Integer type;
+// @ApiModelProperty(value = "开始时间")
+// @TableField("start_time")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+// private LocalDateTime startTime;
+// @ApiModelProperty(value = "结束时间")
+// @TableField("end_time")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+// private LocalDateTime endTime;
+ @ApiModelProperty(value = "站点名称")
+ private String siteName;
+ @ApiModelProperty(value = "合作商名称")
+ private String partnerName;
+
+ @ApiModelProperty(value = "uid")
+ private String uid;
+
+ @ApiModelProperty(value = "结账日期 2024年09月06日17:10:06至2024年09月06日17:10:06")
+ private String time;
+ @ApiModelProperty(value = "充电记录明细")
+ private List<TChargingOrder> list;
+ @ApiModelProperty(value = "收入合计涨幅/跌幅 正数为涨幅负数为跌幅 字段为空 说明没有上月记录 不展示涨幅跌幅")
+ private String incomePercentage;
+ @ApiModelProperty(value = "总利润涨幅/跌幅 正数为涨幅负数为跌幅 字段为空 说明没有上月记录 不展示涨幅跌幅")
+ private String totalPercentage;
+ @ApiModelProperty(value = "利用率")
+ private String rate;
+ @ApiModelProperty(value = "参与电力市场交易退补电费")
+ private Integer electronicRefund;
+
}
--
Gitblit v1.7.1