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/dto/ServiceOrderListDto.java | 74 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 2 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 e27d06a..1b4373e 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,8 +13,53 @@
@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(hidden = true)
+ private Long shopId;
+
+ @ApiModelProperty(hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "客户ID")
+ private Long vipId;
+
+ @ApiModelProperty(hidden = true)
+ private Long companyId;
+
+ public Long getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Long companyId) {
+ this.companyId = companyId;
+ }
+
+ public Long getVipId() {
+ return vipId;
+ }
+
+ public void setVipId(Long vipId) {
+ this.vipId = vipId;
+ }
+
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
+ public Long getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(Long shopId) {
+ this.shopId = shopId;
+ }
public String getQueryKey() {
return queryKey;
@@ -29,6 +74,31 @@
}
public void setStatus(String status) {
- this.status = status;
+ switch (status) {
+ case "0" :
+ this.status = "";
+ break;
+ case "1":
+ this.status = "待确认";
+ break;
+ case "2":
+ this.status = "待预约";
+ break;
+ case "3" :
+ this.status = "需配料";
+ break;
+ case "4" :
+ this.status = "配料完成";
+ break;
+ case "5" :
+ this.status = "服务中";
+ break;
+ case "6" :
+ this.status = "服务完成";
+ break;
+ default:
+ this.status = "";
+ break;
+ }
}
}
--
Gitblit v1.9.1