Browse Source

fix 不给绑定

zoujiajian 2 years ago
parent
commit
c56dc8775a

+ 21 - 22
netflix-service/src/main/java/com/cyksj/service/user/impl/UserIdentCertServiceImpl.java

@@ -13,7 +13,6 @@ import com.cyksj.mapper.UserMapper;
 import com.cyksj.model.dto.UserWxIndentDto;
 import com.cyksj.model.entity.User;
 import com.cyksj.model.entity.UserCertRecord;
-import com.cyksj.model.request.UserBindInfoReq;
 import com.cyksj.model.request.UserIndentCertReq;
 import com.cyksj.model.response.WxCertAuthTokenResp;
 import com.cyksj.redis.RedisService;
@@ -101,27 +100,27 @@ public class UserIdentCertServiceImpl implements UserIdentCertService {
 		Long userId = indentCertReq.getUserId();
 		String redirectUrl = indentCertReq.getRedirectUrl();
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-		String bindState = indentCertReq.getBindState();
-		if (userIdList.size() == 1 && StrUtil.isNotEmpty(bindState)) {
-			User user = userMapper.selectById(userId);
-			if (StrUtil.isEmpty(user.getOpenId())) {
-				String key = RedisService.key.WX_INDENT_BIND_KEY.getEnvName() + bindState;
-				Object bindInfo = redisService.get(key);
-				if (bindInfo == null) {
-					throw BusinessRuntimeException.getInstance("认证信息已失效,请重新操作..");
-				}
-				Long bindUserId = Long.parseLong(bindInfo.toString());
-				User bindUser = userMapper.selectById(bindUserId);
-				//绑定微信端用户
-				UserBindInfoReq request = new UserBindInfoReq();
-				request.setType(StrUtil.isNotBlank(bindUser.getLoginPhone()) ? 1 : 2);
-				request.setUserId(userId);
-				request.setAccount(request.getType() == 1 ? bindUser.getLoginPhone() : bindUser.getEmail());
-				bindTaskService.bindOtherAccount(request);
-				userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-				redisService.del(key);
-			}
-		}
+//		String bindState = indentCertReq.getBindState();
+//		if (userIdList.size() == 1 && StrUtil.isNotEmpty(bindState)) {
+//			User user = userMapper.selectById(userId);
+//			if (StrUtil.isEmpty(user.getOpenId())) {
+//				String key = RedisService.key.WX_INDENT_BIND_KEY.getEnvName() + bindState;
+//				Object bindInfo = redisService.get(key);
+//				if (bindInfo == null) {
+//					throw BusinessRuntimeException.getInstance("认证信息已失效,请重新操作..");
+//				}
+//				Long bindUserId = Long.parseLong(bindInfo.toString());
+//				User bindUser = userMapper.selectById(bindUserId);
+//				//绑定微信端用户
+//				UserBindInfoReq request = new UserBindInfoReq();
+//				request.setType(StrUtil.isNotBlank(bindUser.getLoginPhone()) ? 1 : 2);
+//				request.setUserId(userId);
+//				request.setAccount(request.getType() == 1 ? bindUser.getLoginPhone() : bindUser.getEmail());
+//				bindTaskService.bindOtherAccount(request);
+//				userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+//				redisService.del(key);
+//			}
+//		}
 
 		Integer count = userCertRecordMapper.selectCount(Wrappers.lambdaQuery(UserCertRecord.class)
 				.in(UserCertRecord::getUserId, userIdList));

+ 1 - 3
netflix-web/src/main/java/com/cyksj/web/controller/user/UserCertController.java

@@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
-import com.cyksj.mapper.UserMapper;
 import com.cyksj.model.dto.UserWxIndentDto;
 import com.cyksj.model.entity.UserCertRecord;
 import com.cyksj.model.request.UserIndentCertReq;
@@ -32,8 +31,6 @@ public class UserCertController {
 
 	private final RedisService redisService;
 
-	private final UserMapper userMapper;
-
 
 	/**
 	 * 用户是否已授权认证
@@ -49,6 +46,7 @@ public class UserCertController {
 	 * 非微信端 用户身份认证 建立微信用户绑定关系
 	 */
 	@PostMapping("/bind")
+	@Deprecated
 	public Result<String> bindWxUser() {
 		long userId = StpUserUtil.getLoginIdAsLong();
 		String state = userIdentCertService.bindWxUser(userId);