From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java | 70 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 3 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 292ba6c..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,15 +18,24 @@
@ApiModelProperty(value = "服务单Id")
private Long id;
+ @ApiModelProperty(value = "会员ID")
+ private Long vipId;
+
+ @ApiModelProperty(value = "下单顾问ID")
+ private Long createStaffId;
+
@ApiModelProperty(value = "服务单编号")
private String serviceNo;
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM)
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@ApiModelProperty(value = "预约时间")
private Date time;
@ApiModelProperty(value = "会员名称")
private String vipName;
+
+ @ApiModelProperty(value = "门店名称")
+ private String shopName;
@ApiModelProperty(value = "服务时长")
private Integer timeLength;
@@ -34,11 +43,27 @@
@ApiModelProperty(value = "床位")
private String bed;
- @ApiModelProperty(value = "状态")
+ @ApiModelProperty(value = "状态 1-待预约 2-待派单 3-待配料 4-待服务 5-服务中 6-服务完成 7-服务单结束")
private String status;
@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,7 +125,46 @@
return status;
}
+ public String getShopName() {
+ return shopName;
+ }
+
+ public void setShopName(String shopName) {
+ this.shopName = shopName;
+ }
+
public void setStatus(String status) {
- this.status = status;
+ switch (status) {
+ case "待预约" :
+ this.status = "1";
+ break;
+ case "预约成功待处理" :
+ this.status = "2";
+ break;
+ case "需配料" :
+ this.status = "3";
+ break;
+ case "配料完成" :
+ this.status = "4";
+ break;
+ case "服务中" :
+ this.status = "5";
+ break;
+ case "服务完成" :
+ this.status = "6";
+ break;
+ case "服务单结束" :
+ this.status = "7";
+ break;
+ case "预约取消" :
+ this.status = "8";
+ break;
+ case "待确认" :
+ this.status = "9";
+ break;
+ default:
+ this.status = "0";
+ break;
+ }
}
}
--
Gitblit v1.9.1