From 73cfab8251b8a177960746b426c9257695efbf95 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 14 Jan 2021 10:42:02 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/app/dto/IdSubmitDto.java                         |   26 +++++++++++++
 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java            |   14 +++++++
 zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java                 |   13 ++++--
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java |    2 
 zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java                        |    6 +++
 5 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
index c87652c..8fb17d1 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
@@ -9,6 +9,7 @@
 import com.matrix.core.tools.StringUtils;
 import com.matrix.core.tools.WebUtil;
 import com.matrix.system.app.dto.CreateServiceOrderDto;
+import com.matrix.system.app.dto.IdSubmitDto;
 import com.matrix.system.app.dto.ServiceOrderListDto;
 import com.matrix.system.app.dto.ServiceVipProjDto;
 import com.matrix.system.app.mapper.SysBeauticianStateMapper;
@@ -261,4 +262,17 @@
             return new AjaxResult(AjaxResult.STATUS_FAIL, "取消预约失败");
         }
     }
+
+    @ApiOperation(value = "确认服务", notes = "确认服务")
+    @PostMapping(value = "/confirmServiceOrder")
+    public AjaxResult confirmServiceOrder(@RequestBody @Validated IdSubmitDto idSubmitDto) {
+        SysProjServices services = new SysProjServices();
+        services.setId(idSubmitDto.getId());
+        services.setState(Dictionary.BEATUI_STATE_DYY);
+        int i = projServicesService.modify(services);
+        if (i > 0) {
+            return AjaxResult.buildSuccessInstance("确认成功");
+        }
+        return AjaxResult.buildFailInstance("确认失败");
+    }
 }
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/IdSubmitDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/IdSubmitDto.java
new file mode 100644
index 0000000..5696b13
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/IdSubmitDto.java
@@ -0,0 +1,26 @@
+package com.matrix.system.app.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wzy
+ * @date 2021-01-14
+ **/
+@ApiModel(value = "IdSubmitDto", description = "根据id修改接口参数接收类")
+public class IdSubmitDto {
+
+    @NotNull
+    @ApiModelProperty(value = "id", example = "1")
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+}
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..4a405f6 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,7 +13,7 @@
     @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)
@@ -56,18 +56,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:
diff --git a/zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java b/zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java
index 262e6e7..98b61a9 100644
--- a/zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java
+++ b/zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java
@@ -63,6 +63,12 @@
 	 * 支付方式-卡支付
 	 */
 	String PAY_TYPE_CARD = "划扣";
+
+
+	/**
+	 * 服务单状态-待确认
+	 */
+	String SERVICE_STATU_DQR = "待确认";
 	/**
 	 * 服务单状态-待预约
 	 */
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
index cfb58f7..805e295 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
@@ -125,7 +125,7 @@
         sysProjServices.setCompanyId(user.getCompanyId());
         sysProjServices.setCreateTime(new Date());
         // 设置状态为待预约
-        sysProjServices.setState(Dictionary.SERVICE_STATU_DYY);
+        sysProjServices.setState(Dictionary.SERVICE_STATU_DQR);
         sysProjServices.setServiceNo(codeService.getServiceOrderCode());
         Double hkPrice = 0.0;
         int i = sysProjServicesDao.insert(sysProjServices);

--
Gitblit v1.9.1