From 143acd2312a766f39c75b82bce5a32412b863825 Mon Sep 17 00:00:00 2001 From: jiangyouyao <jiangyouyao> Date: Wed, 06 Apr 2022 14:48:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into develop --- zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java | 16 +++------------- 1 files changed, 3 insertions(+), 13 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 4939cfc..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 @@ -67,8 +67,6 @@ @Autowired private SysBeauticianStateService sysBeauticianStateService; - @Autowired - private RabiitMqTemplate rabiitMqTemplate; @Autowired private AsyncMessageManager asyncMessageManager; @@ -167,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 ->{ @@ -284,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