java/LiquorAuction.git

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/vo/MgtMallOrderVO.java
			@@ -1,9 +1,12 @@
			package com.ruoyi.order.controller.management.vo;

			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
			import com.ruoyi.common.core.enums.BondStatusEnum;
			import com.ruoyi.common.core.enums.OrderFromEnum;
			import com.ruoyi.common.core.enums.OrderStatusEnum;
			import com.ruoyi.common.core.enums.PaymentMethodEnum;
			import com.ruoyi.system.api.domain.vo.Express100VO;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiModelProperty;
			import java.io.Serializable;
			@@ -17,7 +20,7 @@
			*/
			@Data
			@Api(value = "商城订单视图对象")
			public class MgtMallOrderVO implements Serializable {
			public class MgtOrderVO implements Serializable {

			private static final long serialVersionUID = -7047076906373189300L;

			@@ -31,6 +34,18 @@
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private LocalDateTime orderTime;

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

			@ApiModelProperty(value = "所属拍卖场")
			private String salesroomName;

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

			@ApiModelProperty(value = "保证金状态 1=待支付 2=已支付 3=已退款")
			private BondStatusEnum boundStatus;

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

			@@ -72,6 +87,12 @@

			@ApiModelProperty(value = "优惠金额")
			private BigDecimal discountMoney;

			@ApiModelProperty("秒杀价格")
			private BigDecimal seckillPrice;

			@ApiModelProperty("秒杀价格")
			private BigDecimal groupPurchasesPrice;

			@ApiModelProperty(value = "商品数量")
			private Integer goodsQuantity;
			@@ -117,4 +138,7 @@

			@ApiModelProperty("售后信息")
			private MgtOrderReturnRequestVO returnRequestVO;

			@ApiModelProperty("物流信息")
			private Express100VO express100VO;
			}