1.退出大屏账户后，设置默认账户

@@ -33,6 +33,7 @@ import com.topdraw.weixin.util.WeixinUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.assertj.core.util.Arrays;
 import org.assertj.core.util.Arrays;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +45,7 @@ import java.io.IOException;
 import java.net.URLDecoder;
 import java.net.URLDecoder;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Api("账户处理")
 @Api("账户处理")
 @RestController
 @RestController
@@ -166,8 +168,44 @@ public class UserOperationController {
             MemberDTO memberDTO = this.memberService.getByCode(memberCode1);
             MemberDTO memberDTO = this.memberService.getByCode(memberCode1);
             String memberCode = memberDTO.getCode();
             String memberCode = memberDTO.getCode();
             if (StringUtils.isNotBlank(memberCode)) {
             if (StringUtils.isNotBlank(memberCode)) {
+
+                String platformAccount = userTv.getPlatformAccount();
+                UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
+                if (Objects.isNull(userTvDTO))
+                    throw new EntityNotFoundException(UserTvDTO.class,"platformAccount","大屏账户不存在");
+
+                // 解绑
                 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);
+                    }
+
+                }
+
+            } else {
+
+                throw new EntityNotFoundException(MemberDTO.class,"code","会员信息不存在！！");
             }
             }
 
 
         }
         }