From 4fd0278cda787a91eb35d95d6491f5485afe3e48 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期六, 07 九月 2024 18:03:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 200 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java
new file mode 100644
index 0000000..796d4a9
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java
@@ -0,0 +1,200 @@
+package com.ruoyi.order.api.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.web.domain.BasePojo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_settlement confirm")
+@ApiModel(value="TSettlementConfirm对象", description="")
+public class TSettlementConfirm extends BasePojo {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty(value = "站点id")
+ @TableField("site_id")
+ private Integer siteId;
+ @ApiModelProperty(value = "合作商id")
+ @TableField("partner_id")
+ private Integer partnerId;
+ @ApiModelProperty(value = "结算电费备注")
+ @TableField("remark")
+ private String remark;
+ @ApiModelProperty(value = "结算服务费备注")
+ @TableField("service_remark")
+ private String serviceRemark;
+
+ @ApiModelProperty(value = "计量电量（电量合计）")
+ @TableField("metering_electronic")
+ private BigDecimal meteringElectronic;
+ @ApiModelProperty(value = "充电电量")
+ @TableField("charging_electronic")
+ private BigDecimal chargingElectronic;
+ @ApiModelProperty(value = "电损电量")
+ @TableField("loss_electronic")
+ private BigDecimal lossElectronic;
+ @ApiModelProperty(value = "收入合计")
+ @TableField("收入合计")
+ private BigDecimal income;
+
+ @ApiModelProperty(value = "场地费")
+ @TableField("venue")
+ private BigDecimal venue;
+ @ApiModelProperty(value = "计量电费")
+ @TableField("metering")
+ private BigDecimal metering;
+ @ApiModelProperty(value = "清洁费")
+ @TableField("clean")
+ private BigDecimal clean;
+ @ApiModelProperty(value = "日常维护费")
+ @TableField("maintain")
+ private BigDecimal maintain;
+ @ApiModelProperty(value = "成本")
+ @TableField("cost")
+ private BigDecimal cost;
+ @ApiModelProperty(value = "合计可分配金额")
+ @TableField("distribution")
+ private BigDecimal distribution;
+ @ApiModelProperty(value = "利润")
+ @TableField("profit_money")
+ private BigDecimal profitMoney;
+ @ApiModelProperty(value = "新能源利润")
+ @TableField("new_money")
+ private BigDecimal newMoney;
+ @ApiModelProperty(value = "新能源结算金额")
+ @TableField("new_Settlement")
+ private BigDecimal newSettlement;
+
+ @ApiModelProperty(value = "供电局结算电费")
+ @TableField("supply_electronic")
+ private BigDecimal supplyElectronic;
+ @ApiModelProperty(value = "合作商承担电损占比")
+ @TableField("proportion_partner")
+ private BigDecimal proportionPartner;
+ @ApiModelProperty(value = "承担金额")
+ @TableField("proportion_money")
+ private BigDecimal proportionMoney;
+ @ApiModelProperty(value = "本期结算电费总金额 （实际电费转账）")
+ @TableField("total_electronic")
+ private BigDecimal totalElectronic;
+ @ApiModelProperty(value = "本期结算服务费总金额（实际服务费转账）")
+ @TableField("total_service")
+ private BigDecimal totalService;
+ @ApiModelProperty(value = "合作商充电服务费根据合同约定分成比例")
+ @TableField("service_partner")
+ private BigDecimal servicePartner;
+ @ApiModelProperty(value = "合作商充电服务费根据合同约定分成金额")
+ @TableField("service_money")
+ private BigDecimal serviceMoney;
+
+ @ApiModelProperty(value = "三方收费（合计三方平台收费）")
+ @TableField("sharing_amount")
+ private BigDecimal sharingAmount;
+ @ApiModelProperty(value = " 交易手续费 三方收费*0.06%")
+ @TableField("commission_amount")
+ private BigDecimal commissionAmount;
+ @ApiModelProperty(value = "充电电费计费(平台合计电费)")
+ @TableField("electrovalence")
+ private BigDecimal electrovalence;
+ @ApiModelProperty(value = "充电服务费计费（实收服务费）")
+ @TableField("service_charge")
+ private BigDecimal serviceCharge;
+ @ApiModelProperty(value = "交易手续费计费")
+ @TableField("order_commission")
+ private BigDecimal orderCommission;
+ @ApiModelProperty(value = "会员抵扣")
+ @TableField("vip_discount")
+ private BigDecimal vipDiscount;
+ @ApiModelProperty(value = "优惠券抵扣")
+ @TableField("coupon_discount")
+ private BigDecimal couponDiscount;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @ApiModelProperty(value = "类型（1=开始，2=结束）")
+ @TableField("type")
+ private Integer type;
+ @ApiModelProperty(value = "开始时间")
+ @TableField("start_time")
+ private LocalDateTime startTime;
+ @ApiModelProperty(value = "结束时间")
+ @TableField("end_time")
+ private LocalDateTime endTime;
+ @ApiModelProperty(value = "站点名称")
+ @TableField(exist = false)
+ private String siteName;
+ @ApiModelProperty(value = "合作商名称")
+ @TableField(exist = false)
+ private String partnerName;
+
+ @ApiModelProperty(value = "uid")
+ @TableField(exist = false)
+ private String uid;
+
+ @ApiModelProperty(value = "结账日期 2024年09月06日17:10:06至2024年09月06日17:10:06")
+ @TableField(exist = false)
+ private String time;
+ @ApiModelProperty(value = "充电记录明细")
+ @TableField(exist = false)
+ private List<TChargingOrder> list;
+ @ApiModelProperty(value = "收入合计涨幅/跌幅 正数为涨幅负数为跌幅 字段为空 说明没有上月记录 不展示涨幅跌幅")
+ @TableField(exist = false)
+ private String incomePercentage;
+ @ApiModelProperty(value = "总利润涨幅/跌幅 正数为涨幅负数为跌幅 字段为空 说明没有上月记录 不展示涨幅跌幅")
+ @TableField(exist = false)
+ private String totalPercentage;
+ @ApiModelProperty(value = "利用率")
+ @TableField(exist = false)
+ private String rate;
+ @ApiModelProperty(value = "参与电力市场交易退补电费")
+ @TableField(exist = false)
+ private Integer electronicRefund;
+
+}
--
Gitblit v1.7.1