~jiangyouyao/beauty-erp.git

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

			import com.matrix.component.redis.RedisUserLoginUtils;
			import com.matrix.system.common.init.UserCacheManager;
			import com.matrix.core.exception.GlobleException;
			import com.matrix.core.pojo.AjaxResult;
			import com.matrix.core.pojo.PaginationVO;
			@@ -43,7 +43,7 @@
			private ShopActivitiesSalonAttributeDao shopActivitiesSalonAttributeDao;

			@Autowired
			private RedisUserLoginUtils redisUserLoginUtils;
			private UserCacheManager userCacheManager;

			@Autowired
			private ShopActivitiesSalonRecordDao shopActivitiesSalonRecordDao;
			@@ -81,7 +81,7 @@
			*/
			@GetMapping(value = "/findSalonInfoById/{id}")
			public AjaxResult findSalonInfoById(@PathVariable("id") Long id) {
			SysVipInfo user = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
			SysVipInfo user = userCacheManager.getLoginUser();
			ShopActivities shopActivities = shopActivitiesDao.selectSalonActivityById(id);
			ShopActivitiesSalonRecord salonRecord = shopActivitiesSalonRecordDao.selectSalonRecordByUserIdAndActId(user.getOpenId(), id);
			AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("获取成功");
			@@ -104,7 +104,7 @@
			@PostMapping(value = "/joinSalonActivity")
			@Transactional
			public AjaxResult joinSalonActivity(@RequestBody CreateSalonDTO salonDTO) {
			SysVipInfo user = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
			SysVipInfo user = userCacheManager.getLoginUser();

			ShopActivities shopActivities = shopActivitiesDao.selectById(salonDTO.getActId());
			if (shopActivities == null) {
			@@ -172,7 +172,7 @@
			*/
			@RequestMapping(value = "/findSalonListByUser")
			public AjaxResult findSalonListByUser(@RequestBody SalonVO salonVO) {
			SysVipInfo user = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
			SysVipInfo user = userCacheManager.getLoginUser();
			salonVO.setUserId(user.getOpenId());
			List<ShopActivities> list = shopActivitiesDao.selectSalonActivityByUser(salonVO);
			return AjaxResult.buildSuccessInstance(list);