From ad8fc09f3e70b08cd654d38ff9aa9022c2c2c6ec Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Nov 2021 10:26:40 +0800
Subject: [PATCH] fix
---
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
index feeb063..a4161b7 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
@@ -1,13 +1,17 @@
package com.xzx.gc.shop.vo;
+import com.xzx.gc.entity.ScoreOrderDetails;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.List;
@Data
@ApiModel(value = "QueryOrderListVo", description = "返回")
public class QueryOrderListVo {
+ private Long id;
@ApiModelProperty(value="订单编号")
private String orderNo;
@ApiModelProperty(value="客户姓名")
@@ -15,15 +19,21 @@
@ApiModelProperty(value="客户手机号")
private String phone;
@ApiModelProperty(value="下单时间")
- private String createdTime;
+ private String createTime;
+ @ApiModelProperty(value="订单详情")
+ private List<ScoreOrderDetails> orderDetails;
@ApiModelProperty(value="订单总价")
private String totalPrice;
@ApiModelProperty(value="数量")
private String cnt;
+ @ApiModelProperty(value="后台确认提货 1:是 2:否")
+ private Integer isFinish;
@ApiModelProperty(value="状态 2-待收货3-已完成4-已取消")
private String status;
@ApiModelProperty(value="物流公司")
private String expressCom;
@ApiModelProperty(value="物流单号")
private String expressNo;
+ @ApiModelProperty(value="收货地址")
+ private String expressAddress;
}
--
Gitblit v1.9.1