From 206fcf7d6afae27856f63cf0158f53b61fa1b86f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 19 九月 2025 18:21:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java | 72 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 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 f61de6e..fc7c7f3 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,7 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +9,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -39,7 +41,7 @@
@ApiModelProperty(value = "支付金额")
@TableField("pay_money")
- private Double payMoney;
+ private BigDecimal payMoney;
@ApiModelProperty(value = "支付单号")
@TableField("pay_number")
@@ -47,11 +49,77 @@
@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("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;
}
--
Gitblit v1.7.1