From e971ea090aa1f320f3c3f78c3a2a8d50f16dd4d0 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 15 Jan 2021 23:38:19 +0800
Subject: [PATCH] 小程序预约接口修改

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 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 805e295..d1aeb5f 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
@@ -119,13 +119,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_DQR);
         sysProjServices.setServiceNo(codeService.getServiceOrderCode());
         Double hkPrice = 0.0;
         int i = sysProjServicesDao.insert(sysProjServices);
@@ -209,7 +211,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);
         }

--
Gitblit v1.9.1