1.修改保存大小屏H5服务逻辑

@@ -380,23 +380,42 @@ public class UserOperationController {
         String unionid = json.getString("unionid");
         String unionid = json.getString("unionid");
         Assert.state(StrUtil.isNotBlank(unionid), "unionid不可为空");
         Assert.state(StrUtil.isNotBlank(unionid), "unionid不可为空");
 
 
+
+        List<Object> resultList = new ArrayList<>();
         // 大屏侧通过返回值来展示对应的小程序页面
         // 大屏侧通过返回值来展示对应的小程序页面
         String result = SUBSCRIBE;
         String result = SUBSCRIBE;
+        String platformAccount1 = "";
 
 
         // 保存大小屏信息到redis同时返回小屏信息
         // 保存大小屏信息到redis同时返回小屏信息
         UserWeixinDTO userWeixinDTO = this.userTvOperationService.saveUserInfo(data);
         UserWeixinDTO userWeixinDTO = this.userTvOperationService.saveUserInfo(data);
+        // 小屏会员
+        MemberDTO memberDTO = this.memberService.findById(userWeixinDTO.getMemberId());
         // 小屏用户不存在或者关注状态为未关注(0)，返回未关注
         // 小屏用户不存在或者关注状态为未关注(0)，返回未关注
         if (Objects.isNull(userWeixinDTO) || Objects.isNull(userWeixinDTO.getId()) || userWeixinDTO.getStatus() != SUBSCRIBE_STATUS) {
         if (Objects.isNull(userWeixinDTO) || Objects.isNull(userWeixinDTO.getId()) || userWeixinDTO.getStatus() != SUBSCRIBE_STATUS) {
             result = UNSUBSCRIBE;
             result = UNSUBSCRIBE;
-            return ResultInfo.success(result);
+
+            if (Objects.nonNull(memberDTO)) {
+                // 检查是否绑定，返回绑定的大屏账户
+                UserTvDTO userTvDTO = this.userOperationService.checkBind(memberDTO);
+                if (Objects.nonNull(userTvDTO)) {
+                    platformAccount1 = userTvDTO.getPlatformAccount();
+                }
+
+            } else {
+                log.info("userWeixinDTO ==>> [{}]",userWeixinDTO);
+                throw new EntityNotFoundException(MemberDTO.class,"code","member is null !!");
+            }
+
+            resultList.add(result);
+            resultList.add(platformAccount1);
+            log.info("saveUserInfo ==>> result ==>> [{}]",resultList);
+            return ResultInfo.success(resultList);
         }
         }
 
 
         /***************************************************************************************/
         /***************************************************************************************/
-        String platformAccount1 = "";
+
         // 关注未绑定
         // 关注未绑定
         if (result.equalsIgnoreCase(SUBSCRIBE)) {
         if (result.equalsIgnoreCase(SUBSCRIBE)) {
-            // 小屏会员
-            MemberDTO memberDTO = this.memberService.findById(userWeixinDTO.getMemberId());
 
 
             // redis中的大小屏信息
             // redis中的大小屏信息
             String content = (String) this.redisUtils.get(RedisKeyUtil.genSeSuSubscribeKey(unionid));
             String content = (String) this.redisUtils.get(RedisKeyUtil.genSeSuSubscribeKey(unionid));
@@ -434,7 +453,7 @@ public class UserOperationController {
 
 
         }
         }
         /****************************************************************************************/
         /****************************************************************************************/
-        List<Object> resultList = new ArrayList<>();
+
         resultList.add(result);
         resultList.add(result);
         resultList.add(platformAccount1);
         resultList.add(platformAccount1);
 
 

@@ -148,4 +148,5 @@ public interface UserOperationService {
 
 
     UserTvDTO bind(MemberDTO memberDTO, String platformAccount);
     UserTvDTO bind(MemberDTO memberDTO, String platformAccount);
 
 
+    UserTvDTO checkBind(MemberDTO memberDTO);
 }
 }

@@ -1580,13 +1580,14 @@ public class UserOperationServiceImpl implements UserOperationService {
         this.bind(memberDTO,platformAccount);
         this.bind(memberDTO,platformAccount);
     }
     }
 
 
+
+
     @Override
     @Override
     public UserTvDTO bind(MemberDTO memberDTO, String platformAccount) {
     public UserTvDTO bind(MemberDTO memberDTO, String platformAccount) {
 
 
-        MemberDTO memberDTO1 = this.memberService.getByCode(memberDTO.getCode());
-        if (Objects.nonNull(memberDTO1.getUserIptvId())) {
-            UserTvDTO userTvDTO = this.userTvService.findById(memberDTO1.getUserIptvId());
-            return userTvDTO;
+        UserTvDTO userTvDTO1 = this.checkBind(memberDTO);
+        if (Objects.nonNull(userTvDTO1)) {
+            return userTvDTO1;
         }
         }
 
 
         // 大屏账户
         // 大屏账户
@@ -1610,6 +1611,16 @@ public class UserOperationServiceImpl implements UserOperationService {
         return null;
         return null;
     }
     }
 
 
+    @Override
+    public UserTvDTO checkBind(MemberDTO memberDTO) {
+        MemberDTO memberDTO1 = this.memberService.getByCode(memberDTO.getCode());
+        if (Objects.nonNull(memberDTO1.getUserIptvId())) {
+            UserTvDTO userTvDTO = this.userTvService.findById(memberDTO1.getUserIptvId());
+            return userTvDTO;
+        }
+        return null;
+    }
+
     /**
     /**
      *
      *
      * @param userWeixinDTO1
      * @param userWeixinDTO1