From 72aaf45389cd09c206ee1b90f0c7f5bf59782930 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:27:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java | 90 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 88 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 8feb2dc..fc42a5e 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
@@ -2,6 +2,7 @@
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;
@@ -24,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;
@@ -47,6 +48,11 @@
@TableField("pay_number")
private String payNumber;
+
+ @ApiModelProperty(value = "物流单号")
+ @TableField("logistics_number")
+ private String logisticsNumber;
+
@ApiModelProperty(value = "支付流水号")
@TableField("pay_transaction_id")
private String payTransactionId;
@@ -63,6 +69,11 @@
@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 = "支付时间")
@@ -93,7 +104,82 @@
@TableField("trans_type")
private String transType;
- @ApiModelProperty(value = "分账流水号")
+ @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 = "平台是否分佣成功 1=是 2=否")
+ @TableField("is_platform_commission")
+ private Integer isPlatformCommission;
+
+ /**
+ * 新增执行
+ */
+ @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