ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuctionStartStatusEnum.java
@@ -14,7 +14,7 @@ IN_PREVIEW(0, "预展中"), IN_AUCTION(1, "拍卖中"), ENDED(1, "已结束"); ENDED(2, "已结束"); @EnumValue private final int code; @JsonValue ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BannerTypeEnum.java
@@ -11,7 +11,7 @@ public enum BannerTypeEnum { /* 轮播图类型 1=商城首页 2=资讯首页*/ MALL_HOMEPAGE(1, "已领取"), MALL_HOMEPAGE(1, "商城首页"), INFORMATION_HOMEPAGE(2, "资讯首页"); @EnumValue private final int code; ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BondStatusEnum.java
New file @@ -0,0 +1,40 @@ package com.ruoyi.common.core.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonValue; import lombok.AllArgsConstructor; import lombok.Getter; @Getter @AllArgsConstructor public enum BondStatusEnum { /*订单状态 1=待发货 2=待收货 3=已完成 4=已取消*/ TO_PLAY(1, "待支付"), PAID(2, "已支付"), REFUNDED(3, "待收货"); @EnumValue private final int code; @JsonValue private final String desc; /** * 通过code获取枚举 * * @param code * @return */ public static BondStatusEnum fromCode(Integer code) { BondStatusEnum[] resultTypes = BondStatusEnum.values(); for (BondStatusEnum resultType : resultTypes) { if (code.equals(resultType.getCode())) { return resultType; } } return null; } } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberBond.java
@@ -7,6 +7,7 @@ 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; @@ -40,6 +41,9 @@ @ApiModelProperty(value = "会员id") private Long memberId; @ApiModelProperty(value = "订单号") private String orderNo; @ApiModelProperty(value = "拍卖商品id") private Long auctionGoodsId; @@ -52,8 +56,8 @@ @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)