beauty-erp.git - Gitblit

			@@ -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;
			@@ -146,7 +147,6 @@
			if (StringUtils.isBlank(pageVo.getOrder())) {
			pageVo.setOrder("desc");
			}
			projService.setShopId(getMe().getShopId());
			List<SysProjServices> dataList = projServicesSerivce.findInPage(projService, pageVo);
			AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList, projServicesSerivce.findTotal(projService));
			return result;
			@@ -186,17 +186,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 +275,7 @@
			return "admin/hive/beautySalon/yypb-form";
			}


			/**
			* 进入预约排班详情
			*
			@@ -316,7 +310,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 +451,7 @@
			}
			}


			/**
			* 根据id取消预约
			*/
			@@ -493,8 +490,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 +505,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 +522,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 +562,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() {
			// 根据岗位名称查询员工