From 19fb7fa1fdbcee7cecfee1554610bb40f40e2976 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 15 Jan 2021 23:38:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java
index 07ec313..5b2679d 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java
@@ -13,14 +13,36 @@
@ApiModelProperty(value = "查询参数")
private String queryKey;
- @ApiModelProperty(value = "状态 0/全部 1/带预约 2/带配料 3/待服务 4/服务中 5/已完成")
+ @ApiModelProperty(value = "状态 0/全部 1/待确认 2/待排班 3/待配料 4/待服务 5/服务中 6/已完成 ")
private String status;
+
+ @ApiModelProperty(value = "客户视角状态 0/全部 1/待确认 2进行中（待排班/待配料/待服务/服务中） 3/待评价（已完成/服务结束） 4/已评价 5/已取消 ")
+ private String vipStatus;
@ApiModelProperty(hidden = true)
private Long shopId;
@ApiModelProperty(hidden = true)
private Long userId;
+
+ @ApiModelProperty(value = "客户ID")
+ private Long vipId;
+
+ public String getVipStatus() {
+ return vipStatus;
+ }
+
+ public void setVipStatus(String vipStatus) {
+ this.vipStatus = vipStatus;
+ }
+
+ public Long getVipId() {
+ return vipId;
+ }
+
+ public void setVipId(Long vipId) {
+ this.vipId = vipId;
+ }
public Long getUserId() {
return userId;
@@ -56,18 +78,21 @@
this.status = "";
break;
case "1":
+ this.status = "待确认";
+ break;
+ case "2":
this.status = "待预约";
break;
- case "2" :
+ case "3" :
this.status = "需配料";
break;
- case "3" :
+ case "4" :
this.status = "配料完成";
break;
- case "4" :
+ case "5" :
this.status = "服务中";
break;
- case "5" :
+ case "6" :
this.status = "服务完成";
break;
default:
--
Gitblit v1.9.1