From b141df9bf9764db8567efebed48006e12ab1f657 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 14 Aug 2022 15:52:45 +0800
Subject: [PATCH] fix:jhy 停止下单
---
gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
index 0d9fdad..52dfd3e 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
@Data
@ApiModel(value = "JhyOrderListVo", description = "集物员订单列表返回参数类")
public class JhyOrderListVo {
@@ -15,7 +17,7 @@
private String reserveTime;
@ApiModelProperty(value = "姓名")
- private String name;
+ private String username;
@ApiModelProperty(value = "手机号")
private String phone;
@@ -26,15 +28,60 @@
@ApiModelProperty(value = "地址")
private String address;
+ @ApiModelProperty(value = "单元栋")
+ private String unitName;
+
+ @ApiModelProperty(value = "门牌号")
+ private String houseNumber;
+
@ApiModelProperty(value = "经度")
- private String lon;
+ private String longitude;
@ApiModelProperty(value = "纬度")
- private String lat;
+ private String latitude;
@ApiModelProperty(value = "重量")
private String weight;
+ @ApiModelProperty(value = "取货时间")
+ private String receivingTime;
+
@ApiModelProperty(value = "备注")
private String remark;
+
+ @ApiModelProperty(value = "入库时间")
+ private String storageTime;
+
+ @ApiModelProperty(value = "入库重量")
+ private String storageWeight;
+
+ @ApiModelProperty(value = "入库积分")
+ private String storageScore;
+
+ @ApiModelProperty(value = "回收重量")
+ private String recycleWeight;
+
+ @ApiModelProperty(value = "回收积分")
+ private String recycleScore;
+
+ @ApiModelProperty(value = "损耗重量")
+ private int lossWeight;
+
+ @ApiModelProperty(value = "状态")
+ private Integer status;
+
+ @ApiModelProperty(value = "集物员姓名")
+ private String jhyName;
+
+ @ApiModelProperty(value = "集物员电话")
+ private String jhyPhone;
+
+ @ApiModelProperty(value = "回收/台")
+ private String recycleTai;
+
+ @ApiModelProperty(value = "回收/kg")
+ private String recycleKg;
+
+ @ApiModelProperty(value = "用户下单数量")
+ private Integer userOrderCnt;
}
\ No newline at end of file
--
Gitblit v1.9.1