From c9eaf5e50fe5e63f31997f5ceb5378334e9b8a33 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 29 五月 2024 09:39:21 +0800
Subject: [PATCH] 拍卖会保证金表字段调整
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuctionStartStatusEnum.java | 2 +-
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberBond.java | 8 ++++++--
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BondStatusEnum.java | 40 ++++++++++++++++++++++++++++++++++++++++
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BannerTypeEnum.java | 2 +-
4 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuctionStartStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuctionStartStatusEnum.java
index b50aea0..575a525 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuctionStartStatusEnum.java
+++ b/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
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BannerTypeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BannerTypeEnum.java
index 7dce997..e817104 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BannerTypeEnum.java
+++ b/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;
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BondStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BondStatusEnum.java
new file mode 100644
index 0000000..3fb6ec3
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BondStatusEnum.java
@@ -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;
+ }
+
+}
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 6ec36a7..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
@@ -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)
--
Gitblit v1.7.1