From 9fbd7c475b86b79d2820fc6cf8b49c408dd279c7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 16 Jan 2021 23:19:17 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
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..405a534 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
@@ -19,6 +19,7 @@
import com.matrix.system.hive.pojo.MyBeauticianCount;
import com.matrix.system.hive.service.*;
import com.matrix.system.shopXcx.mqTask.MQTaskRouting;
+import com.matrix.system.wechart.templateMsg.UniformMsgParam;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -119,13 +120,15 @@
public SysProjServices addSysProjServices(SysProjServices sysProjServices) throws GlobleException {
//创建服务单
- SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
- sysProjServices.setCreateStaffId(user.getSuId());
- sysProjServices.setShopId(user.getShopId());
- sysProjServices.setCompanyId(user.getCompanyId());
+ if(WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY)!=null){
+ SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+ sysProjServices.setCreateStaffId(user.getSuId());
+ sysProjServices.setShopId(user.getShopId());
+ sysProjServices.setCompanyId(user.getCompanyId());
+ }
+
+
sysProjServices.setCreateTime(new Date());
- // 设置状态为待预约
- sysProjServices.setState(Dictionary.SERVICE_STATU_DYY);
sysProjServices.setServiceNo(codeService.getServiceOrderCode());
Double hkPrice = 0.0;
int i = sysProjServicesDao.insert(sysProjServices);
@@ -209,7 +212,7 @@
//插入订单明细
sysBeauticianState.setProjId(sysProjInfo.getId());
sysBeauticianState.setServicesId(sysProjServices.getId());
- sysBeauticianState.setShopId(user.getShopId());
+ sysBeauticianState.setShopId(sysProjServices.getShopId());
sysBeauticianState.setState(Dictionary.BEATUI_STATE_DYY);
beauticianStateDao.insert(sysBeauticianState);
}
@@ -397,7 +400,7 @@
// 设置成功状态
- projServices.setState(Dictionary.SERVICE_STATU_YYCG);
+ projServices.setState(Dictionary.SERVICE_STATU_XPL);
// 判断当前门店是否有历史美疗师
LastestWorkBeatuistaff lastWorkStaff = new LastestWorkBeatuistaff();
lastWorkStaff.setShopId(checkProjServices.getShopId());
@@ -575,11 +578,13 @@
projServices.setState(Dictionary.SERVICE_STATU_FFJS);
projServices.setConsumeTime(new Date());
int result=sysProjServicesDao.update(projServices);
+ achieveNewService.addAchieveByServiceOrder(projServices);
+
//发送微信公众号提醒
- JSONObject param=new JSONObject();
- param.put("companyId",projServices.getCompanyId());
- param.put("serviceId",projServices.getId());
- rabiitMqTemplate.sendMsg(MQTaskRouting.SEND_UNIFORM_TEMPLATE_MSG+evn,param.toJSONString());
+ UniformMsgParam uniformMsgParam=new UniformMsgParam(projServices.getCompanyId(),UniformMsgParam.GZH_FWWC);
+ uniformMsgParam.put("serviceId",projServices.getId());
+ rabiitMqTemplate.sendMsg(MQTaskRouting.SEND_UNIFORM_TEMPLATE_MSG+evn,uniformMsgParam.toJSONString());
+
return result;
}
}
--
Gitblit v1.9.1