From 2eb4e3b8ca10cc860fe0681f9737803cfb145e25 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 16 七月 2024 16:55:47 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/OrderAuctionBond.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/OrderAuctionBond.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/OrderAuctionBond.java
index 92ef099..7960cdb 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/OrderAuctionBond.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/OrderAuctionBond.java
@@ -6,6 +6,9 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
+import com.ruoyi.common.core.enums.BondStatusEnum;
+import com.ruoyi.common.core.enums.PaymentMethodEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -51,8 +54,11 @@
@ApiModelProperty(value = "保证金")
private BigDecimal bond;
- @ApiModelProperty(value = "是否缴纳保证金")
- private Boolean boundStatus;
+ @ApiModelProperty(value = "保证金状态 1=待支付 2=已支付 3=已退款")
+ private BondStatusEnum boundStatus;
+
+ @ApiModelProperty(value = "保证金类型1=普通拍品 2=拍卖会拍品")
+ private AuctionOrderTypeEnum bondType;
@ApiModelProperty(value = "创建者")
@TableField(value = "create_by", fill = FieldFill.INSERT)
@@ -63,7 +69,7 @@
private LocalDateTime createTime;
@ApiModelProperty(value = "更新者")
- @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
+ @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
private String updateBy;
@ApiModelProperty(value = "更新时间")
@@ -73,11 +79,15 @@
@ApiModelProperty(value = "删除标志（0代表存在 1代表删除）")
@TableLogic
private Integer delFlag;
+
+
@ApiModelProperty(value = "支付方式 1=微信 2=支付宝")
- private Integer paymentMethod;
+ private PaymentMethodEnum paymentMethod;
@ApiModelProperty(value = "保证金订单编号")
private String orderNo;
+ @ApiModelProperty("失效时间")
+ private LocalDateTime orderTimeSx;
}
--
Gitblit v1.7.1