java/LiquorAuction.git

			@@ -61,7 +61,7 @@
			@ApiModelProperty(value = "支付合计")
			private BigDecimal totalAmount;

			@ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消")
			@ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消 6=售后中 7=已退款 8=已退款退货")
			private OrderStatusEnum orderStatus;

			@ApiModelProperty(value = "支付时间")
			@@ -105,7 +105,6 @@
			@TableLogic
			private Integer delFlag;


			@ApiModelProperty(value = "快递单号")
			private String courierNumber;

			@@ -113,15 +112,13 @@
			private String receiverName;

			@ApiModelProperty(value = "收货人电话")
			private String receiverphone;
			private String receiverPhone;

			@ApiModelProperty(value = "城市")
			private String receiverCity;


			@ApiModelProperty(value = "详细地址")
			private String receiverDetailAddress;


			@ApiModelProperty(value = "保证金")
			private BigDecimal bound;
			@@ -129,5 +126,30 @@
			@ApiModelProperty(value = "开票状态开票状态 1 待开票，2待审核，3 已开票，4 拒绝")
			private Integer invoiceStatus;

			@ApiModelProperty(value = "优惠券id")
			private Long couponId;

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

			@ApiModelProperty(value = "商品名称")
			private String skuName;

			@ApiModelProperty(value = "封面图")
			private String coverPic;

			@ApiModelProperty(value = "商品价格")
			private BigDecimal price;

			@ApiModelProperty(value = "积分")
			private Integer points;

			@ApiModelProperty("发货快递")
			private String logisticsNum;

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

			@ApiModelProperty("拍卖会id")
			private Long auctionSalesroomId;
			}