From 81507d0c196821cd333f08c75f3978e726df24cd Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 17 May 2022 15:38:10 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 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 c477e5e..c7eee3b 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
@@ -165,6 +165,7 @@
sysProjServices.setVipId(serviceOrderDto.getVipId());
sysProjServices.setYyTime(serviceOrderDto.getYyTime());
sysProjServices.setRemark(serviceOrderDto.getRemark());
+ sysProjServices.setBedId(serviceOrderDto.getBedId());
List<SysBeauticianState> sysBeauticianStates = new ArrayList<>();
serviceOrderDto.getProjItems().forEach(item ->{
@@ -282,17 +283,8 @@
@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) {
- //发送微信公众号提醒
- services=projServicesService.findById(services.getId());
- UniformMsgParam uniformMsgParam=new UniformMsgParam(services.getCompanyId(),UniformMsgParam.GZH_YYCG);
- uniformMsgParam.put("serviceId",services.getId());
- asyncMessageManager.sendMsg(AsyncMessageRouting.SEND_UNIFORM_TEMPLATE_MSG ,uniformMsgParam);
-
+ int i=projServicesService.confirmServiceOrder(idSubmitDto.getId());
+ if(i>0){
return AjaxResult.buildSuccessInstance("确认成功");
}
return AjaxResult.buildFailInstance("确认失败");
--
Gitblit v1.9.1