java/zhihuishenqu.git

			@@ -25,6 +25,7 @@
			import java.util.ArrayList;
			import java.util.List;
			import java.util.Map;
			import java.util.Objects;

			import static java.util.Objects.isNull;
			import static java.util.Objects.nonNull;
			@@ -67,6 +68,10 @@
			@Override
			@Transactional(rollbackFor = Exception.class)
			public R addPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO) {
			ConvenientElevatingPointDO convenientElevatingPointDODB = this.baseMapper.selectOne(new LambdaQueryWrapper<ConvenientElevatingPointDO>().eq(ConvenientElevatingPointDO::getWechatAccount, convenientElevatingPointDTO.getWechatAccount()));
			if (!Objects.isNull(convenientElevatingPointDODB)){
			return R.fail("该微信手机号已使用，请更换");
			}
			ConvenientElevatingPointDO convenientElevatingPointDO = new ConvenientElevatingPointDO();
			BeanUtils.copyProperties(convenientElevatingPointDTO, convenientElevatingPointDO);
			String communityId = convenientElevatingPointDTO.getCommunityId();
			@@ -89,11 +94,16 @@
			@Override
			@Transactional(rollbackFor = Exception.class)
			public R putPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO) {
			ConvenientElevatingPointDO convenientElevatingPointDODB = this.baseMapper.selectOne(new LambdaQueryWrapper<ConvenientElevatingPointDO>().eq(ConvenientElevatingPointDO::getWechatAccount, convenientElevatingPointDTO.getWechatAccount()));

			Long id = convenientElevatingPointDTO.getId();
			ConvenientElevatingPointDO convenientElevatingPointDO = this.baseMapper.selectById(id);
			if (isNull(convenientElevatingPointDO)) {
			return R.fail("自提点不存在");
			}
			if (nonNull(convenientElevatingPointDODB) && !convenientElevatingPointDODB.getId().equals(convenientElevatingPointDO.getId())) {
			R.fail("该微信手机号:" + convenientElevatingPointDTO.getWechatAccount() + "已被使用！请更换");
			}
			String communityId = convenientElevatingPointDTO.getCommunityId();
			if (nonNull(communityId)) {
			ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(",") + 1)));