From fefa68e08d3d2e97f57a583c5df5883231641f75 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 18:26:39 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java | 86 ++++++++++++++++++++++++-------------------
1 files changed, 48 insertions(+), 38 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java
index 0dffef9..c0d4796 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewJhyOrderVo.java
@@ -1,49 +1,59 @@
package com.xzx.gc.shop.vo;
+import com.xzx.gc.entity.JhyOrderItems;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.List;
@Data
@ApiModel(value = "ViewJhyOrderVo", description = "订单")
public class ViewJhyOrderVo {
-// @ApiModelProperty(value="订单编号")
-// private String order_no;
-//
-// @ApiModelProperty(value="收件人")
-// private String nick_name;
-//
-// @ApiModelProperty(value="电话号码")
-// private String mobile_phone;
-//
-// @ApiModelProperty(value="地址")
-// private String areaAddress;
-//
-// @ApiModelProperty(value="预约年月日")
-// private String reserve_date;
-// @ApiModelProperty(value="预约时间")
-// private String reserve_time;
-//
-// @ApiModelProperty(value="订单状态")
-// private String orderNo;
-//
-// @ApiModelProperty(value="集物员")
-// private String orderNo;
-//
-// @ApiModelProperty(value="集物员联系方式")
-// private String orderNo;
-//
-// @ApiModelProperty(value="收货时间")
-// private String orderNo;
-//
-// @ApiModelProperty(value="备注")
-// private String orderNo;
-//
-// @ApiModelProperty(value="评论")
-// private String orderNo;
-// @ApiModelProperty(value="得分 0-0分1-20分2-40分3-60分4-80分5-100分")
-// private String score;
-// @ApiModelProperty(value="是否匿名 1-是2-否")
-// private String is_anonymous;
+ @ApiModelProperty(value="订单编号")
+ private String orderNo;
+
+ @ApiModelProperty(value="收件人")
+ private String nickName;
+
+ @ApiModelProperty(value="电话号码")
+ private String mobilePhone;
+
+ @ApiModelProperty(value="区域")
+ private String area;
+
+ @ApiModelProperty(value="地址")
+ private String Address;
+
+ @ApiModelProperty(value="预约年月日")
+ private String reserveDate;
+
+ @ApiModelProperty(value="预约时间")
+ private String reserveTime;
+
+ @ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
+ private String status;
+
+ @ApiModelProperty(value="集物员")
+ private String username;
+
+ @ApiModelProperty(value="集物员联系方式")
+ private String mobile;
+
+ @ApiModelProperty(value="收货时间")
+ private String receivingTime;
+
+ @ApiModelProperty(value="备注")
+ private String remark;
+
+ @ApiModelProperty(value="评论")
+ private String comment;
+ @ApiModelProperty(value="得分 0-0分1-20分2-40分3-60分4-80分5-100分")
+ private String score;
+ @ApiModelProperty(value="是否匿名 1-是2-否")
+ private String isAnonymous;
+
+ private List<JhyOrderItems> JhyOrderItems;
+
}
--
Gitblit v1.9.1