java/LiquorAuction.git

			@@ -2,6 +2,7 @@

			import com.baomidou.mybatisplus.annotation.*;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.fasterxml.jackson.annotation.JsonInclude;
			import com.ruoyi.common.core.enums.*;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			@@ -12,61 +13,79 @@
			@Data
			public class OrderVO {
			@ApiModelProperty(value = "订单id")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private Long id;

			@ApiModelProperty(value = "商品id")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private Long goodsSkuId;

			@ApiModelProperty(value = "订单编号")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private String orderNo;

			@ApiModelProperty(value = "下单时间")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private LocalDateTime orderTime;

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

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

			@ApiModelProperty(value = "会员id")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private Long memberId;

			@ApiModelProperty(value = "支付方式 1=微信 2=支付宝")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private PaymentMethodEnum paymentMethod;

			@ApiModelProperty(value = "支付合计")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private BigDecimal totalAmount;

			@ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private OrderStatusEnum orderStatus;

			@ApiModelProperty(value = "支付时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private LocalDateTime payTime;

			@ApiModelProperty(value = "取消时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private LocalDateTime cancelTime;

			@ApiModelProperty(value = "订单备注")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private String orderRemark;

			@ApiModelProperty(value = "发货时间")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private LocalDateTime deliveryTime;

			@ApiModelProperty(value = "确认收货时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private LocalDateTime receiveTime;

			@ApiModelProperty(value = "优惠金额")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private BigDecimal discountMoney;

			@ApiModelProperty(value = "商品数量")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private Integer goodsQuantity;

			@ApiModelProperty(value = "创建时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private LocalDateTime createTime;


			@@ -76,57 +95,74 @@


			@ApiModelProperty(value = "快递单号")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private String courierNumber;

			@ApiModelProperty(value = "收货人姓名")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private String receiverName;

			@ApiModelProperty(value = "收货人电话")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private String receiverPhone;

			@ApiModelProperty(value = "城市")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private String receiverCity;


			@ApiModelProperty(value = "详细地址")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private String receiverDetailAddress;


			@ApiModelProperty(value = "保证金")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private BigDecimal bound;

			@ApiModelProperty(value = "开票状态开票状态 1 待开票，2待审核，3 已开票，4 拒绝")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private Integer invoiceStatus;

			@ApiModelProperty(value = "商品名称")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private String skuName;

			@ApiModelProperty(value = "封面图")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private String coverPic;

			@ApiModelProperty(value = "商品价格")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private BigDecimal price;


			@ApiModelProperty(value = "积分")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private Integer points;

			@ApiModelProperty(value = "实际商品价格")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private BigDecimal sjPrice;

			@ApiModelProperty(value = "成团时间")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private LocalDateTime purchase;

			@ApiModelProperty(value = "是否售后")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private Integer isRequest;

			@ApiModelProperty(value = "售后状态 1=待审核 2=待退货 3=待平台收货 4=已完成 5=已拒绝")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private ReturnRequestStatusEnum status;

			@ApiModelProperty(value = "成团时间")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private LocalDateTime groupTime;

			@ApiModelProperty(value = "是否退保证金 1没有退，2 已退")
			@JsonInclude(JsonInclude.Include.ALWAYS)
			private Integer isAuctionBond;

			}