From 6f101829f41501b8be92b6af38bc564513cb1ca5 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 29 五月 2024 10:01:28 +0800 Subject: [PATCH] 拍卖会出价表字段调整 --- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberBond.java | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberBond.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberBond.java index 39ad0e5..a6760c0 100644 --- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberBond.java +++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberBond.java @@ -1,13 +1,18 @@ package com.ruoyi.auction.domain; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; -import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +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 io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -30,11 +35,14 @@ private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty(value = "会员id") private Long memberId; + + @ApiModelProperty(value = "订单号") + private String orderNo; @ApiModelProperty(value = "拍卖商品id") private Long auctionGoodsId; @@ -45,26 +53,30 @@ @ApiModelProperty(value = "保证金") private BigDecimal bond; - @ApiModelProperty(value = "保证金类型1=普通拍品 2=拍卖会") - private Integer bondType; + @ApiModelProperty(value = "保证金类型1=普通拍品 2=拍卖会拍品") + private AuctionOrderTypeEnum bondType; - @ApiModelProperty(value = "是否退保证金 0=是 1=否") - private Integer returned; + @ApiModelProperty(value = "保证金状态 0=待支付 1=已支付 2=已退款") + private BondStatusEnum bondStatus; @ApiModelProperty(value = "创建者") + @TableField(value = "create_by", fill = FieldFill.INSERT) private String createBy; @ApiModelProperty(value = "创建时间") + @TableField(value = "create_time", fill = FieldFill.INSERT) private LocalDateTime createTime; @ApiModelProperty(value = "更新者") + @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) private String updateBy; @ApiModelProperty(value = "更新时间") + @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @ApiModelProperty(value = "删除标志(0代表存在 1代表删除)") + @TableLogic private Integer delFlag; - } -- Gitblit v1.7.1