From 5ebd818a240239e22cb3a587e616991bf208d56b Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 09 Jul 2021 23:57:02 +0800
Subject: [PATCH] bug修复
---
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
index bfe6257..77dc742 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
@@ -1,6 +1,7 @@
package com.matrix.system.hive.action;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import com.matrix.core.anotations.RemoveRequestToken;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
@@ -186,17 +187,10 @@
AjaxResult result = AjaxResult.buildSuccessInstance("查询成功");
SysProjUse queryUse = new SysProjUse();
- if(Objects.nonNull(vipId)){
- queryUse.setVipId(vipId);
- }else{
- SysVipInfo vipInfo = getCurrentVioInfo();
- queryUse.setVipId(vipInfo.getId());
- }
-
+ queryUse.setVipId(vipId);
queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
queryUse.setTaocanId(-1L);
queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
- queryUse.setIsOver(Dictionary.FLAG_NO_N);
List<SysProjUse> projList = projUseService.findInPage(queryUse, null);
//切换到套餐查询条件
queryUse.setTaocanId(null);
@@ -282,6 +276,7 @@
return "admin/hive/beautySalon/yypb-form";
}
+
/**
* 进入预约排班详情
*
@@ -316,7 +311,9 @@
for (SysBeauticianState sysBeauticianState : beauticianStateList) {
if (sysBeauticianState.getProjUse().getTaocanId() != null) {
SysProjUse sysProjUse = projUseService.findById(sysBeauticianState.getProjUse().getTaocanId());
- sysBeauticianState.getProjInfo().setName(sysProjUse.getProjName()+"--"+sysBeauticianState.getProjInfo().getName());
+ if(sysProjUse != null) {
+ sysBeauticianState.getProjInfo().setName(sysProjUse.getProjName() + "--" + sysBeauticianState.getProjInfo().getName());
+ }
}
}
}
@@ -455,6 +452,7 @@
}
}
+
/**
* 根据id取消预约
*/
@@ -493,8 +491,7 @@
@RequestMapping(value = "/addService")
public @ResponseBody
AjaxResult servicceAdd(@RequestBody SysProjServices sysProjServices) {
- SysVipInfo vipInfo = getCurrentVioInfo();
- sysProjServices.setVipId(vipInfo.getId());
+
if (CollectionUtils.isEmpty(sysProjServices.getServiceItems())) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "没有选中可消耗的项目");
@@ -509,7 +506,9 @@
if (balanceverifyResult.isError()) {
return new AjaxResult(AjaxResult.STATUS_FAIL, balanceverifyResult.getMsg());
}
- sysProjServices.setState(Dictionary.SERVICE_STATU_YYCG);
+ if (StrUtil.isEmpty(sysProjServices.getState())) {
+ sysProjServices.setState(Dictionary.SERVICE_STATU_DYY);
+ }
SysProjServices newSysProjServices = sysProjServicesService.addSysProjServices(sysProjServices);
if (newSysProjServices != null) {
return AjaxResult.buildSuccessInstance(Arrays.asList(newSysProjServices));
@@ -524,8 +523,8 @@
@RequestMapping(value = "/addServiceForForm")
public @ResponseBody
AjaxResult servicceAddForForm(SysProjServices sysProjServices) {
- SysVipInfo vipInfo = getCurrentVioInfo();
- sysProjServices.setVipId(vipInfo.getId());
+
+
if (CollectionUtils.isEmpty(sysProjServices.getServiceItems())) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "没有选中可消耗的项目");
@@ -564,6 +563,26 @@
}
+ @RequestMapping(value = "/addServiceProj")
+ @ResponseBody
+ public AjaxResult addServiceProj(SysProjServices sysProjServices) {
+
+ return AjaxResult.buildSuccessInstance("保存成功");
+ }
+
+ /**
+ * 删除服务单项目/套餐
+ * @param id
+ * @return
+ */
+ @RequestMapping(value = "/delServiceOrderItems")
+ @ResponseBody
+ public AjaxResult delServiceOrderItems(Long id) {
+ sysProjServicesService.deleteProjServiceItemById(id);
+ return AjaxResult.buildSuccessInstance("删除成功");
+ }
+
+
// 准备页面数据
private void pageDate() {
// 根据岗位名称查询员工
--
Gitblit v1.9.1