From 193945d70b561bc96bb608b47b9b2e4dba3b45b2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 三月 2025 11:40:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java | 65 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 6 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 8617e44..42b77b4 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
@@ -5,9 +5,12 @@
import com.baomidou.mybatisplus.annotation.TableId;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
@@ -16,6 +19,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,6 +45,10 @@
@TableField("contract_id")
private String contractId;
+ @ApiModelProperty(value = "合同编号")
+ @TableField("contract_number")
+ private String contractNumber;
+
@ApiModelProperty(value = "应缴费")
@TableField("payable_fees_money")
private BigDecimal payableFeesMoney;
@@ -47,7 +56,7 @@
@ApiModelProperty(value = "应缴费日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("payable_fees_time")
- private LocalDateTime payableFeesTime;
+ private LocalDate payableFeesTime;
@ApiModelProperty(value = "缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期 5= 已失效")
@TableField("pay_fees_status")
@@ -58,7 +67,7 @@
private BigDecimal payFeesMoney;
@ApiModelProperty(value = "缴费日期")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("pay_fees_time")
private LocalDateTime payFeesTime;
@@ -66,7 +75,7 @@
@TableField("pay_fees_type")
private Integer payFeesType;
- @ApiModelProperty(value = "账单类型 1=租金 2=押金 3=生活费用")
+ @ApiModelProperty(value = "账单类型 1=租金 2=押金 3=生活费用 4=房屋验收")
@TableField("bill_type")
private String billType;
@@ -92,13 +101,57 @@
@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;
+
+ @ApiModelProperty(value = "短信发送状态：0.未发送 1.已发送 2.发送失败")
+ @TableField("sms_status")
+ private Integer smsStatus;
+
+ @ApiModelProperty(value = "短信最后发送时间")
+ @TableField("sms_last_time")
+ private Date smsLastTime;
+
+ @ApiModelProperty(value = "最后短信发送人")
+ @TableField("sms_send_userid")
+ private String smsSendUserid;
+
+
+ @ApiModelProperty(value = "邮件发送状态：0.未发送 1.已发送 2.发送失败")
+ @TableField("mail_status")
+ private Integer mailStatus;
+
+ @ApiModelProperty(value = "邮件最后发送时间")
+ @TableField("mail_last_time")
+ private Date mailLastTime;
+
+ @ApiModelProperty(value = "最后邮件发送人")
+ @TableField("mail_send_userid")
+ private String mailSendUserid;
+
+ /**
+ * 抵扣金额
+ */
+ @TableField(exist = false)
+ private BigDecimal deductionMoney;
+ /**
+ * 抵扣前欠费金额
+ */
+ @TableField(exist = false)
+ private BigDecimal preOutstand;
+
+
+
+
+
}
--
Gitblit v1.7.1