java/zhihuishenqu.git

			@@ -1335,6 +1335,7 @@
			@Override
			public R addUserBackstageProperty(AdministratorsUserVO administratorsUserVO) {
			SysUserDO sysUserDO = new SysUserDO();
			String appId=userDao.getCommunityAppId(administratorsUserVO.getCommunityId());
			Long roleId = administratorsUserVO.getRoleId();
			if (roleId.intValue() == 777777777) {
			SysRoleDO sysRoleDO = new SysRoleDO();
			@@ -1376,10 +1377,6 @@
			}
			}
			log.info("======================type"+administratorsUserVO.getType());
			if (administratorsUserVO.getType().equals(20)){
			roleId=1559112102373756548L;
			administratorsUserVO.setType(3);
			}
			log.info("=======================roleId"+roleId);
			SysRoleDO roleDO = roleDAO.selectById(roleId);
			if (ObjectUtils.isEmpty(roleDO)) {
			@@ -1388,6 +1385,7 @@
			String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
			administratorsUserVO.setPassword(encode);
			BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
			sysUserDO.setAppId(appId);
			int insert = 0;
			try {
			insert = userDao.insert(sysUserDO);
			@@ -1410,6 +1408,9 @@
			SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
			sysUserRoleDO.setUserId(userId);
			sysUserRoleDO.setRoleId(roleDO.getRoleId());
			if (sysUserDO.getCommunityId().equals(10172)){
			sysUserRoleDO.setRoleId(1559112102373756548L);
			}
			int insert1 = sysUserRoleDAO.insert(sysUserRoleDO);
			if (insert1 > 0) {
			return R.ok(userId);
			@@ -2871,7 +2872,8 @@
			@Transactional(rollbackFor = Exception.class)
			public R addConvenientMerchantUser(ConvenientMerchantDTO convenientMerchantDTO) {
			SysUserDO sysUserDO;
			sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, convenientMerchantDTO.getAccount()));
			sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, convenientMerchantDTO.getAccount())
			.eq(SysUserDO::getPhone,convenientMerchantDTO.getMobilePhone()).eq(SysUserDO::getAppId,"wx118de8a734d269f0"));
			if (nonNull(sysUserDO)) {
			return R.fail("账户已经存在");
			}
			@@ -2880,10 +2882,10 @@
			String encode = new BCryptPasswordEncoder().encode(convenientMerchantDTO.getPassword());
			BeanUtils.copyProperties(convenientMerchantDTO, sysUserDO);
			sysUserDO.setAccount(convenientMerchantDTO.getAccount());
			sysUserDO.setType(10);
			sysUserDO.setType(5);
			sysUserDO.setAreaId(null);
			sysUserDO.setStatus(1);
			sysUserDO.setPhone(null);
			sysUserDO.setPhone(convenientMerchantDTO.getMobilePhone());
			sysUserDO.setName(convenientMerchantDTO.getContacts());
			sysUserDO.setPassword(encode);
			try {
			@@ -3977,14 +3979,17 @@

			@Override
			public R feedBackReply(SysUserFeedbackVO sysUserFeedbackVO) {
			SysUserFeedbackDO sysUserFeedbackDO=new SysUserFeedbackDO();
			BeanUtils.copyProperties(sysUserFeedbackVO, sysUserFeedbackDO);
			return R.ok(sysUserFeedbackDAO.updateById(sysUserFeedbackDO));
			if (isNull(sysUserFeedbackVO.getReply())){
			return R.fail("回复内容不能为空");
			}
			SysUserFeedbackDO sysUserFeedbackDO1 = sysUserFeedbackDAO.selectById(sysUserFeedbackVO.getId());
			sysUserFeedbackDO1.setReply(sysUserFeedbackVO.getReply());
			return R.ok(sysUserFeedbackDAO.reply(sysUserFeedbackDO1));
			}

			@Override
			public R myFeedBack(Long id,Integer type) {
			List<SysUserFeedbackDO> sysUserFeedbackDOS = sysUserFeedbackDAO.selectList(new QueryWrapper<SysUserFeedbackDO>().lambda().eq(SysUserFeedbackDO::getType, type).eq(SysUserFeedbackDO::getUserId, id));
			public R myFeedBack(Long id,Integer type,Long propertyId) {
			List<SysUserFeedbackDO> sysUserFeedbackDOS = sysUserFeedbackDAO.selectList(new QueryWrapper<SysUserFeedbackDO>().lambda().eq(SysUserFeedbackDO::getType, type).eq(SysUserFeedbackDO::getUserId, id).eq(SysUserFeedbackDO::getPropertyId,propertyId ));
			return R.ok(sysUserFeedbackDOS);
			}