From 5fa6e6f8410ef9d057174bcff2a3c5038c54a551 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 18:41:20 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TFlowManagement.java | 69 +++++++++++++++-------------------
1 files changed, 31 insertions(+), 38 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TFlowManagement.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFlowManagement.java
index cb29e4c..de4b72e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TFlowManagement.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFlowManagement.java
@@ -1,11 +1,16 @@
package com.ruoyi.system.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.math.BigDecimal;
import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,41 +22,50 @@
* </p>
*
* @author xiaochen
- * @since 2025-01-17
+ * @since 2025-01-20
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_flow_management")
@ApiModel(value="TFlowManagement对象", description="流水管理")
-public class TFlowManagement implements Serializable {
+public class TFlowManagement extends BaseModel {
private static final long serialVersionUID = 1L;
- @TableId("id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
+ @ApiModelProperty(value = "营运部门ID")
+ @TableField("business_dept_id")
+ private String businessDeptId;
+
@ApiModelProperty(value = "系统流水号")
- @TableField("sysSerialNumber")
+ @TableField("sys_serial_number")
private String sysSerialNumber;
@ApiModelProperty(value = "银行流水号")
- @TableField("bankSerialNumber")
+ @TableField("bank_serial_number")
private String bankSerialNumber;
@ApiModelProperty(value = "流水金额")
- @TableField("flowMoney")
- private Double flowMoney;
+ @TableField("flow_money")
+ private BigDecimal flowMoney;
@ApiModelProperty(value = "抵扣金额")
- @TableField("deductionMoney")
- private Double deductionMoney;
+ @TableField("deduction_money")
+ private BigDecimal deductionMoney;
+
+ @ApiModelProperty(value = "抵扣前欠费金额")
+ @TableField("pre_outstand")
+ private BigDecimal preOutstand;
@ApiModelProperty(value = "剩余金额")
- @TableField("remainingMoney")
- private Double remainingMoney;
+ @TableField("remaining_money")
+ private BigDecimal remainingMoney;
@ApiModelProperty(value = "支付时间")
- @TableField("payTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("pay_time")
private LocalDateTime payTime;
@ApiModelProperty(value = "付款人")
@@ -59,41 +73,20 @@
private String payer;
@ApiModelProperty(value = "流水状态 1=正常 2=异常")
- @TableField("flowStatus")
+ @TableField("flow_status")
private Integer flowStatus;
@ApiModelProperty(value = "流水类型 1=系统 2=银行")
- @TableField("flowType")
+ @TableField("flow_type")
private Integer flowType;
@ApiModelProperty(value = "支付方式 1=微信支付 2=支付宝支付 3=线下支付")
- @TableField("payType")
+ @TableField("pay_type")
private Integer payType;
@ApiModelProperty(value = "缴费账单id")
- @TableField("paymentBillId")
+ @TableField("payment_bill_id")
private String paymentBillId;
-
- @ApiModelProperty(value = "创建时间")
- @TableField("createTime")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "修改时间")
- @TableField("updateTime")
- private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "创建人")
- @TableField("createBy")
- private String createBy;
-
- @ApiModelProperty(value = "修改人")
- @TableField("updateBy")
- private String updateBy;
-
- @ApiModelProperty(value = "是否删除 0=否 1=是")
- @TableField("isDelete")
- @TableLogic
- private Integer isDelete;
}
--
Gitblit v1.7.1