java/LiquorAuction.git

New file
			@@ -0,0 +1,39 @@
			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 AuctionOrderTypeEnum {

			/* 拍卖订单类型 1=普通拍品 2=拍卖会拍品*/

			REGULAR_ITEMS(1, "普通拍品"),
			AUCTION_ITEMS(2, "拍卖会拍品");
			@EnumValue
			private final int code;
			@JsonValue
			private final String desc;


			/**
			* 通过code获取枚举
			*
			* @param code
			* @return
			*/
			public static AuctionOrderTypeEnum fromCode(Integer code) {
			AuctionOrderTypeEnum[] resultTypes = AuctionOrderTypeEnum.values();
			for (AuctionOrderTypeEnum resultType : resultTypes) {
			if (code.equals(resultType.getCode())) {
			return resultType;
			}
			}
			return null;
			}

			}

			@@ -6,6 +6,7 @@
			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.OrderFromEnum;
			import com.ruoyi.common.core.enums.OrderStatusEnum;
			import com.ruoyi.common.core.enums.PaymentMethodEnum;
			@@ -45,8 +46,11 @@
			@ApiModelProperty(value = "下单时间")
			private LocalDateTime orderTime;

			@ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=保证金 5=拍卖订单")
			@ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单")
			private OrderFromEnum orderFrom;

			@ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
			private AuctionOrderTypeEnum auctionType;

			@ApiModelProperty(value = "会员id")
			private Long memberId;

			@@ -9,6 +9,7 @@
			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;
			@@ -41,8 +42,14 @@
			@ApiModelProperty(value = "拍卖场id")
			private Long auctionSalesroomId;

			@ApiModelProperty(value = "商品id")
			private Long goodsSkuId;
			@ApiModelProperty(value = "拍卖商品id")
			private Long auctionGoodsId;

			@ApiModelProperty(value = "会员id")
			private Long memberId;

			@ApiModelProperty(value = "保证金")
			private BigDecimal bond;

			@ApiModelProperty(value = "是否缴纳保证金")
			private Boolean boundStatus;

	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuctionOrderTypeEnum.java	39 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Order.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuctionBond.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史