From a9dc61d23c4e38c37a6004662638dc8e2077267d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 18 二月 2025 14:00:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
index c75228c..38f218b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
@@ -8,6 +8,7 @@
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
@@ -16,6 +17,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.data.annotation.Transient;
+import springfox.documentation.annotations.ApiIgnore;
/**
* <p>
@@ -40,18 +43,22 @@
@TableField("contract_id")
private String contractId;
+ @ApiModelProperty(value = "合同编号")
+ @TableField("contract_number")
+ private String contractNumber;
+
@ApiModelProperty(value = "应缴费")
@TableField("payable_fees_money")
- private Double payableFeesMoney;
+ private BigDecimal payableFeesMoney;
@ApiModelProperty(value = "应缴费日期")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("payable_fees_time")
private LocalDateTime payableFeesTime;
- @ApiModelProperty(value = "缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期")
+ @ApiModelProperty(value = "缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期 5= 已失效")
@TableField("pay_fees_status")
- private Integer payFeesStatus;
+ private String payFeesStatus;
@ApiModelProperty(value = "缴费金额")
@TableField("pay_fees_money")
@@ -68,7 +75,7 @@
@ApiModelProperty(value = "账单类型 1=租金 2=押金 3=生活费用")
@TableField("bill_type")
- private Integer billType;
+ private String billType;
@ApiModelProperty(value = "逾期天数")
@TableField("over_days")
@@ -92,13 +99,27 @@
@TableField("bank_serial_number")
private String bankSerialNumber;
- @ApiModelProperty(value = "实际收款")
- @TableField("actual_money")
- private BigDecimal actualMoney;
+ @ApiModelProperty(value = "欠费金额")
+ @TableField("outstanding_money")
+ private BigDecimal outstandingMoney;
@ApiModelProperty(value = "凭证上传")
@TableField("voucher")
private String voucher;
+ @ApiModelProperty(value = "t_bill_confirm表确认单关联ID")
+ @TableField("confirm_id")
+ private String confirmId;
+
+ /**
+ * 抵扣金额
+ */
+ @TableField(exist = false)
+ private BigDecimal deductionMoney;
+ /**
+ * 抵扣前欠费金额
+ */
+ @TableField(exist = false)
+ private BigDecimal preOutstand;
}
--
Gitblit v1.7.1