--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/vo/order/bg/OrderListVO.java

+package com.zrqx.core.vo.order.bg;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+@Data
+public class OrderListVO {
+
+	@ApiModelProperty("id")
+	private Integer id;
+	
+	@ApiModelProperty("订单编号")
+	private String code;
+	
+	@ApiModelProperty("订单用户名")
+	private String createrName;
+	
+	@ApiModelProperty("订单金额")
+	private BigDecimal payment;
+	
+	@ApiModelProperty("订单状态")
+	private String status;
+	
+	@ApiModelProperty("订单状态中文")
+	private String statusZh;
+	
+	@ApiModelProperty("下单时间")
+	private Date createTime;
+	
+	@ApiModelProperty("订单来源")
+	private String orderSource;
+	
+	@ApiModelProperty("订单来源中文")
+	private String orderSourceZh;
+	
+	@ApiModelProperty("支付方式  0支付宝1微信")
+	private String payType;
+	
+	@ApiModelProperty("是否需要开票")
+	private Integer needInvoice;
+	
+	@ApiModelProperty("开票状态（0未开票，1已开票）")
+	private String invoiceStatus;
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/order/bg/OrderVO.java

+package com.zrqx.core.vo.order.bg;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.zrqx.core.model.order.OrderInfo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class OrderVO {
+
+	@ApiModelProperty("id")
+	private Integer id;
+	
+	@ApiModelProperty("下单会员")
+	private String createName;
+	
+	@ApiModelProperty("订单编号")
+	private String code;
+	
+	@ApiModelProperty("订单状态")
+	private String status;
+	
+	@ApiModelProperty("下单时间")
+	private Date createTime;
+	
+	@ApiModelProperty("支付方式")
+	private String payType;
+	
+	@ApiModelProperty("订单来源")
+	private String orderSource;
+	
+	@ApiModelProperty("支付时间")
+	private Date payTime;
+	
+	@ApiModelProperty("订单总金额")
+	private BigDecimal orderPayment;
+	
+	@ApiModelProperty("支付金额")
+	private BigDecimal payment;
+	
+	@ApiModelProperty("订单详情列表")
+	private List<OrderInfo> orderinfoList;
+	
+	@ApiModelProperty("发票信息id")
+	private String invoiceId;
+	
+	@ApiModelProperty("发票类型")
+	private Integer invoiceType;
+	
+	@ApiModelProperty("发票抬头")
+	private String invoiceTitle;
+	
+	@ApiModelProperty("纳税人识别号")
+	private String taxpayerIdentificationNumber;
+	
+	@ApiModelProperty("备注")
+	private String note;
+}