java/LiquorAuction.git

			@@ -1,11 +1,16 @@
			package com.ruoyi.order.controller.management.vo;

			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.ruoyi.common.core.enums.AuditStatusEnum;
			import com.ruoyi.common.core.enums.OrderTypeEnum;
			import com.ruoyi.common.core.enums.PaymentMethodEnum;
			import com.ruoyi.common.core.enums.RequestTypeEnum;
			import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
			import com.ruoyi.system.api.domain.vo.Express100VO;
			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;

			@@ -58,6 +63,50 @@
			@ApiModelProperty(value = "备注")
			private String remark;

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

			@ApiModelProperty(value = "订单编号")
			private String orderNo;

			@ApiModelProperty(value = "下单时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private LocalDateTime orderTime;

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

			@ApiModelProperty(value = "会员姓名")
			private String nickname;

			@ApiModelProperty("联系方式")
			private String phone;

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

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

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

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

			@ApiModelProperty(value = "支付合计")
			private BigDecimal totalAmount;

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

			@ApiModelProperty(value = "订单类型 1=商城订单 2=拍卖订单")
			private OrderTypeEnum orderType;

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

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