From f9cfd322ebd0924cf346d4cc9198bc3a5d9d80c0 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 29 五月 2024 15:01:47 +0800
Subject: [PATCH] 1.提交退款远程调用接口 2.拍卖保证金实体类字段调整
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuctionBond.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuctionBond.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuctionBond.java
index 0577669..86359a3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuctionBond.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/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)
@@ -74,7 +80,7 @@
@TableLogic
private Integer delFlag;
@ApiModelProperty(value = "支付方式 1=微信 2=支付宝")
- private Integer paymentMethod;
+ private PaymentMethodEnum paymentMethod;
@ApiModelProperty(value = "保证金订单编号")
private String orderNo;
--
Gitblit v1.7.1