From 4705f9b4084d9ccddb601569b223f0fb41778a94 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 12 Aug 2021 15:28:46 +0800
Subject: [PATCH] fix

---
 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
index 2a7d445..59561f0 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
@@ -18,6 +18,12 @@
     @ApiModelProperty(value = "服务单Id")
     private Long id;
 
+    @ApiModelProperty(value = "会员ID")
+    private Long vipId;
+
+    @ApiModelProperty(value = "下单顾问ID")
+    private Long createStaffId;
+
     @ApiModelProperty(value = "服务单编号")
     private String serviceNo;
 
@@ -27,6 +33,9 @@
 
     @ApiModelProperty(value = "会员名称")
     private String vipName;
+
+    @ApiModelProperty(value = "门店名称")
+    private String shopName;
 
     @ApiModelProperty(value = "服务时长")
     private Integer timeLength;
@@ -39,6 +48,22 @@
 
     @ApiModelProperty(value = "服务项目信息")
     private List<ServiceOrderListProjVo> projs;
+
+    public Long getVipId() {
+        return vipId;
+    }
+
+    public void setVipId(Long vipId) {
+        this.vipId = vipId;
+    }
+
+    public Long getCreateStaffId() {
+        return createStaffId;
+    }
+
+    public void setCreateStaffId(Long createStaffId) {
+        this.createStaffId = createStaffId;
+    }
 
     public List<ServiceOrderListProjVo> getProjs() {
         return projs;
@@ -100,6 +125,14 @@
         return status;
     }
 
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
     public void setStatus(String status) {
         switch (status) {
             case "待预约" :
@@ -123,8 +156,14 @@
             case "服务单结束" :
                 this.status = "7";
                 break;
+            case "预约取消" :
+                this.status = "8";
+                break;
+            case "待确认" :
+                this.status = "9";
+                break;
             default:
-                this.status = "1";
+                this.status = "0";
                 break;
         }
     }

--
Gitblit v1.9.1