From be9e92d2c30fdfeed4bdd3a5aea2c84bd93f61f4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 15 十月 2025 16:23:24 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java | 128 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 126 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java
index 01dcea2..980f5a5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java
@@ -1,6 +1,8 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +10,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -22,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_erp_procurement")
@ApiModel(value="TErpProcurement对象", description="erp采购")
-public class TErpProcurement extends BaseModel {
+public class TErpProcurement implements Serializable {
private static final long serialVersionUID = 1L;
@@ -45,13 +48,134 @@
@TableField("pay_number")
private String payNumber;
+
+ @ApiModelProperty(value = "物流单号")
+ @TableField("logistics_number")
+ private String logisticsNumber;
+
@ApiModelProperty(value = "支付流水号")
@TableField("pay_transaction_id")
- private String payTransactionId;
+ private String payTransactionId;
@ApiModelProperty(value = "状态 1=草稿 2=待支付 3=待发货 4=已发货 5=已入库 6=已取消")
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "发送时间")
+ @TableField("send_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime sendTime;
+
+
+ @ApiModelProperty(value = "入库操作人")
+ private String warehousingUserId;
+
+ @ApiModelProperty(value = "入库时间")
+ @TableField("warehousing_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime warehousingTime;
+
+
+ @ApiModelProperty(value = "支付时间")
+ @TableField("pay_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime payTime;
+
+ @ApiModelProperty(value = "退款编号")
+ @TableField("refund_no")
+ private String refundNo;
+
+ @ApiModelProperty(value = "退款时间")
+ @TableField("refund_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime refundTime;
+
+ @ApiModelProperty(value = "退款流水号")
+ @TableField("refund_log_no")
+ private String refundLogNo;
+
+ @ApiModelProperty(value = "终端号")
+ @TableField("term_no")
+ private String termNo;
+ @ApiModelProperty(value = "钱包类型")
+ @TableField("account_type")
+ private String accountType;
+ @ApiModelProperty(value = "接入方式")
+ @TableField("trans_type")
+ private String transType;
+
+ @ApiModelProperty(value = "分账指令流水号")
+ @TableField("separate_no")
+ private String separateNo;
+
+ @ApiModelProperty(value = "商户分账指令流水号")
+ @TableField("out_separate_no")
+ private String outSeparateNo;
+
+ @ApiModelProperty(value = "平台得金额")
+ @TableField("money")
+ private BigDecimal money;
+
+ @ApiModelProperty(value = "回退流水")
+ @TableField("refund_out_separate_no")
+ private String refundOutSeparateNo;
+
+ @ApiModelProperty(value = "1未回退 2已回退")
+ @TableField("refund_status")
+ private Integer refundStatus;
+
+ @ApiModelProperty(value = "供应商id")
+ @TableField("supplier_id")
+ private String supplierId;
+
+
+ @ApiModelProperty(value = "商户号")
+ @TableField("merchant_no")
+ private String merchantNo;
+
+ @ApiModelProperty(value = "供应商分佣金额")
+ @TableField("supplier_money")
+ private BigDecimal supplierMoney;
+
+ /**
+ * 新增执行
+ */
+ @ApiModelProperty(value = "记录创建人，前端忽略")
+ @TableField(value = "create_by", fill = FieldFill.INSERT)
+ private String createBy;
+
+ /**
+ * 新增和更新执行
+ */
+ @ApiModelProperty(value = "记录修改人，前端忽略")
+ @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
+ private String updateBy;
+ /**
+ * 删除 未删除
+ */
+ @JsonIgnore
+ @TableField("`disabled`")
+ @TableLogic
+ private Boolean disabled;
+
+ @ApiModelProperty(value = "记录创建时间，前端忽略")
+ @TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ /**
+ * 最后修改时间
+ */
+ @ApiModelProperty(value = "记录修改时间，前端忽略")
+ @TableField("update_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateTime;
+ /**
+ * 新增执行
+ */
+ @ApiModelProperty(value = "记录创建人id，前端忽略")
+ @TableField(value = "create_id", fill = FieldFill.INSERT)
+ private String createId;
+
}
--
Gitblit v1.7.1