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

@@ -160,53 +160,46 @@ 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();
-                UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
-                if (Objects.isNull(userTvDTO))
-                    throw new EntityNotFoundException(UserTvDTO.class,"platformAccount","大屏账户不存在");
 
 
+        String platformAccount = userTv.getPlatformAccount();
+        UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
+        if (Objects.isNull(userTvDTO))
+            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());
-                if (CollectionUtils.isNotEmpty(memberDTOList)) {
-                    List<MemberDTO> collect = memberDTOList.stream().filter(memberDTO1 -> !memberDTO1.getCode().equalsIgnoreCase(memberCode1)).collect(Collectors.toList());
-
-                    if (CollectionUtils.isNotEmpty(collect) ){
-
-                        if(collect.size() > 1) {
-                            collect.sort(new Comparator<MemberDTO>() {
-                                @Override
-                                public int compare(MemberDTO memberDTO, MemberDTO t1) {
-                                    return t1.getBindIptvTime().compareTo(memberDTO.getBindIptvTime());
-                                }
-                            });
-                        }
-
-                        // 有其他会员的话，绑定最早的一个会员
-                        MemberDTO memberDTO1 = collect.get(0);
-                        userTvDTO.setPriorityMemberCode(memberDTO1.getCode());
-                        BeanUtils.copyProperties(userTvDTO,userTv);
-                        this.userTvService.update(userTv);
-                    }
+            // 设置默认账号，以时间最早的为准
+            /*List<MemberDTO> memberDTOList = this.memberService.findByUserIptvId(userTvDTO.getId());
+            if (CollectionUtils.isNotEmpty(memberDTOList)) {
+                List<MemberDTO> collect = memberDTOList.stream().filter(memberDTO1 -> !memberDTO1.getCode().equalsIgnoreCase(memberCode1)).collect(Collectors.toList());
 
 
-                }
+                if (CollectionUtils.isNotEmpty(collect) ){
 
 
-            } else {
+                    if(collect.size() > 1) {
+                        collect.sort(new Comparator<MemberDTO>() {
+                            @Override
+                            public int compare(MemberDTO memberDTO, MemberDTO t1) {
+                                return t1.getBindIptvTime().compareTo(memberDTO.getBindIptvTime());
+                            }
+                        });
+                    }
 
 
-                throw new EntityNotFoundException(MemberDTO.class,"code","会员信息不存在！！");
-            }
+                    // 有其他会员的话，绑定最早的一个会员
+                    MemberDTO memberDTO1 = collect.get(0);
+                    userTvDTO.setPriorityMemberCode(memberDTO1.getCode());
+                    BeanUtils.copyProperties(userTvDTO,userTv);
+                    this.userTvService.update(userTv);
+                }
 
 
+            }*/
         }
         }
 
 
         return ResultInfo.success();
         return ResultInfo.success();