~jiangyouyao/beauty-erp.git

			@@ -1,7 +1,7 @@
			package com.matrix.system.shopXcx.api.action;

			import com.matrix.biz.bean.BizUser;
			import com.matrix.biz.dao.BizUserDao;
			import com.matrix.system.hive.bean.SysVipInfo;
			import com.matrix.system.hive.dao.SysVipInfoDao;
			import com.matrix.component.rabbitmq.RabiitMqTemplate;
			import com.matrix.component.redis.RedisUserLoginUtils;
			import com.matrix.core.exception.GlobleException;
			@@ -75,7 +75,7 @@
			SysUsersDao staffInfoDao;

			@Autowired
			BizUserDao bizUserDao;
			SysVipInfoDao sysVipInfoDao;

			@Autowired
			RabiitMqTemplate rabiitMqTemplate;
			@@ -260,8 +260,8 @@
			@RequestMapping(value = "/createServiceOrder")
			public @ResponseBody
			AjaxResult createServiceOrder(@RequestBody Onlinebooking onlinebooking) {
			BizUser bizUser = redisUserLoginUtils.getLoginUser(BizUser.class);
			SysVipInfo vipInfo = vipInfoDao.selectByPhone(bizUser.getPhoneNumber());
			SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
			SysVipInfo vipInfo = vipInfoDao.selectByPhone(sysVipInfo.getPhone());
			SysProjUse sysProjUse = projUseDao.selectById(Long.parseLong(onlinebooking.getProductId() + ""));
			Date yyTime = DateUtil.stringToDate(onlinebooking.getTimeStr(), DateUtil.DATE_FORMAT_MM);
			SysProjServices sysProjServices = new SysProjServices();
			@@ -347,8 +347,8 @@
			@PostMapping(value = "/getServiceOrderList")
			@ResponseBody
			public AjaxResult findServiceOrderList(@RequestBody @Validated ErpServiceOrderListDto orderListDto) {
			BizUser bizUser = redisUserLoginUtils.getLoginUser(BizUser.class);
			SysVipInfo vipInfo= vipInfoDao.selectByPhone(bizUser.getPhoneNumber());
			SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
			SysVipInfo vipInfo= vipInfoDao.selectByPhone(sysVipInfo.getPhone());
			orderListDto.setVipId(vipInfo.getId());
			List<ErpServiceOrderListVo> apiServiceOrderListInPage = projServicesDao.findWxServiceOrderList(orderListDto);
			return AjaxResult.buildSuccessInstance(apiServiceOrderListInPage,"查询成功");