From ad0ec618318f3c1bc28fcc520d2ddf1cad2905e3 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 15 Jan 2021 12:49:03 +0800
Subject: [PATCH] 修改小程序预约接口1
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 59424ef..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;
@@ -137,12 +138,14 @@
throw new GlobleException("请选择服务");
}
SysVipInfo vipInfo = sysVipInfoService.findById(serviceOrderDto.getVipId());
- if (StringUtils.isBlank(vipInfo.getPassWord())) {
- return AjaxResult.buildFailInstance("未设置资金密码");
- }
+// if (StringUtils.isBlank(vipInfo.getPassWord())) {
+// return AjaxResult.buildFailInstance("未设置资金密码");
+// }
- if (!vipInfo.getPassWord().equals(serviceOrderDto.getPassword())) {
- return AjaxResult.buildFailInstance("资金密码错误");
+ if (StringUtils.isNotBlank(vipInfo.getPassWord())) {
+ if (!vipInfo.getPassWord().equals(serviceOrderDto.getPassword())) {
+ return AjaxResult.buildFailInstance("资金密码错误");
+ }
}
SysProjServices sysProjServices = new SysProjServices();
@@ -259,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("确认失败");
+ }
}
--
Gitblit v1.9.1