1.绑定时暂时不自动绑定主账号

@@ -160,25 +160,24 @@ public class UserOperationController {
 
 
         UserTv userTv = new UserTv();
         UserTv userTv = new UserTv();
         BeanUtils.copyProperties(resources,userTv);
         BeanUtils.copyProperties(resources,userTv);
-        String unionid = resources.getUnionid();
-        String memberCode1 = resources.getMemberCode();
-        if (Objects.nonNull(memberCode1)) {
-
-            MemberDTO memberDTO = this.memberService.getByCode(memberCode1);
-            String memberCode = memberDTO.getCode();
-            if (StringUtils.isNotBlank(memberCode)) {
 
 
         String platformAccount = userTv.getPlatformAccount();
         String platformAccount = userTv.getPlatformAccount();
         UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
         UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
         if (Objects.isNull(userTvDTO))
         if (Objects.isNull(userTvDTO))
-                    throw new EntityNotFoundException(UserTvDTO.class,"platformAccount","大屏账户不存在");
+            throw new EntityNotFoundException(UserTvDTO.class, "platformAccount", "大屏账户不存在");
 
 
+        String memberCode = resources.getMemberCode();
+        MemberDTO memberDTO = this.memberService.getByCode(memberCode);
+        if (Objects.nonNull(memberDTO)) {
+            String _memberCode = memberDTO.getCode();
+            if (StringUtils.isNotBlank(_memberCode)) {
                 // 解绑
                 // 解绑
-                userTv.setMemberCode(memberCode);
+                userTv.setMemberCode(_memberCode);
                 this.userTvOperationService.unbind(userTv);
                 this.userTvOperationService.unbind(userTv);
+            }
 
 
             // 设置默认账号，以时间最早的为准
             // 设置默认账号，以时间最早的为准
-                List<MemberDTO> memberDTOList = this.memberService.findByUserIptvId(userTvDTO.getId());
+            /*List<MemberDTO> memberDTOList = this.memberService.findByUserIptvId(userTvDTO.getId());
             if (CollectionUtils.isNotEmpty(memberDTOList)) {
             if (CollectionUtils.isNotEmpty(memberDTOList)) {
                 List<MemberDTO> collect = memberDTOList.stream().filter(memberDTO1 -> !memberDTO1.getCode().equalsIgnoreCase(memberCode1)).collect(Collectors.toList());
                 List<MemberDTO> collect = memberDTOList.stream().filter(memberDTO1 -> !memberDTO1.getCode().equalsIgnoreCase(memberCode1)).collect(Collectors.toList());
 
 
@@ -200,13 +199,7 @@ public class UserOperationController {
                     this.userTvService.update(userTv);
                     this.userTvService.update(userTv);
                 }
                 }
 
 
-                }
-
-            } else {
-
-                throw new EntityNotFoundException(MemberDTO.class,"code","会员信息不存在！！");
-            }
-
+            }*/
         }
         }
 
 
         return ResultInfo.success();
         return ResultInfo.success();