From feda6b70c8381453bab437d73341b1e7dd60bf10 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Nov 2021 11:00:11 +0800
Subject: [PATCH] 20211108

---
 gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
index ae1f281..0e29a3d 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
@@ -5,31 +5,46 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 @ApiModel(value = "QueryJhyOrderListVo", description = "返回")
 public class QueryJhyOrderListVo {
 
     private Long id;
+    private Long userId;
     @ApiModelProperty(value="订单号")
     private String orderNo;
     @ApiModelProperty(value="联系人")
     private String name;
     @ApiModelProperty(value="手机号")
     private String mobilePhone;
+    @ApiModelProperty(value="集物员手机号")
+    private String jhyMobilePhone;
     @ApiModelProperty(value="区域地址")
     private String area;
     @ApiModelProperty(value="详细地址")
     private String address;
+    @ApiModelProperty(value="单元栋")
+    private String unitName;
+    @ApiModelProperty(value="楼门牌号")
+    private String houseNumber;
+    @ApiModelProperty(value="预约年月日")
+    private String reserveDate;
     @ApiModelProperty(value="预约时间")
     private String reserveTime;
     @ApiModelProperty(value="订单总金额")
     private BigDecimal totalPrice;
-    @ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
+    @ApiModelProperty(value="总重")
+    private BigDecimal totalWeight;
+    @ApiModelProperty(value="状态 1-待接单2-已接单3-已收款(用户)/待入库(集物员)4-已完成5-已取消")
     private Integer status;
     @ApiModelProperty(value="集物员")
     private String username;
     @ApiModelProperty(value="备注")
     private String remark;
 
+    @ApiModelProperty(value="回收类型")
+    private List<JhyOrderItemsVo> jhyOrderItemsVos;
+
 }

--
Gitblit v1.9.1