java/zhihuishenqu.git

			@@ -2283,14 +2283,20 @@
			String encode = new BCryptPasswordEncoder().encode(storeVO.getStorePassword());
			BeanUtils.copyProperties(storeVO, sysUserDO);
			sysUserDO.setAccount(storeVO.getStoreAccount());
			sysUserDO.setType(5);
			sysUserDO.setType(20);
			sysUserDO.setCommunityId(communityId);
			sysUserDO.setAreaId(null);
			sysUserDO.setStatus(1);
			sysUserDO.setPhone(storeVO.getPhone());
			sysUserDO.setName(storeVO.getContacts());
			sysUserDO.setPassword(encode);
			sysUserDO.setAppId("wx0cef797390444b75");
			try {
			insert = userDao.insert(sysUserDO);
			SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
			sysUserRoleDO.setUserId(sysUserDO.getUserId());
			sysUserRoleDO.setRoleId(sysRoleDO.getRoleId());
			sysUserRoleDAO.insert(sysUserRoleDO);
			// 把SysUserId赋值给店铺
			if (sysUserDO.getUserId() != null) {
			userDao.updateStoreByPhone(storeVO.getPhone(), sysUserDO.getUserId());
			@@ -3563,7 +3569,7 @@
			@Override
			public R uuPush(String washPhone,String phone,String washName,Integer orderStatus) {
			if(StringUtils.isNotEmpty(phone)){
			SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone,phone).orderByDesc(SysUserDO::getCreateAt).last("limit 1"));
			SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone,phone).eq(SysUserDO::getAppId,"wx118de8a734d269f0").orderByDesc(SysUserDO::getCreateAt).last("limit 1"));
			if(sysUserDO!=null&&StringUtils.isNotEmpty(sysUserDO.getOpenid())){
			String status="";
			String accessToken="";
			@@ -3693,6 +3699,15 @@
			return R.ok();
			}

			@Override
			public R accept(Long userId) {
			SysUserDO sysUserDO=new SysUserDO();
			sysUserDO.setUserId(userId);
			sysUserDO.setIsAccept(1);
			userDao.updateById(sysUserDO);
			return R.ok();
			}

			/**
			* 三说会堂新增业务中心或专家账号
			* */