1.添加解绑、换绑的日志

xianghan
Commit 75e045cd ... 75e045cdf006dc52a864609112f6a61c43ab73a2 authored 2022-06-14 14:39:09 +0800 by xianghan
Showing 2 changed files with 46 additions and 11 deletions
member-service-impl/src/main/java/com/topdraw/business/process/rest/UserOperationController.java
member-service-impl/src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
--- a/member-service-impl/src/main/java/com/topdraw/business/process/rest/UserOperationController.java
View file @75e045c
+++ b/member-service-impl/src/main/java/com/topdraw/business/process/rest/UserOperationController.java
View file @75e045c
@@ -459,6 +459,18 @@ public class UserOperationController {
    public ResultInfo tvUnbind(@Validated(value = {UpdateGroup.class}) @RequestBody TvUnBindBean resources) {
        log.info("UserOperationController ==> unbind ==>> param  ==> [{}]",resources);
+        String memberCode = resources.getMemberCode();
+        log.info("大屏解绑，前端参数，需要解绑的会员code，memberCode ==>> {}", memberCode);
+        if (StringUtils.isBlank(memberCode)) {
+            throw new BadRequestException(GlobeExceptionMsg.MEMBER_CODE_IS_NULL);
+        }
+        String platformAccount = resources.getPlatformAccount();
+        log.info("大屏解绑，前端参数，大屏账号，platformAccount ==>> {}", platformAccount);
+        if (StringUtils.isBlank(platformAccount)) {
+            throw new BadRequestException(GlobeExceptionMsg.IPTV_PLATFORM_ACCOUNT_IS_NULL);
+        }
        this.userOperationService.tvUnbind(resources);
        return ResultInfo.success();
    }
--- a/member-service-impl/src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
View file @75e045c
+++ b/member-service-impl/src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
View file @75e045c
@@ -697,25 +697,33 @@ public class UserOperationServiceImpl implements UserOperationService {
        String platformAccount = resources.getPlatformAccount();
        String memberCode = resources.getMemberCode();
-        MemberDTO memberDTO = this.memberService.findByCode(memberCode);
        UserTvDTO userTvDTO = this.findByPlatformAccount(platformAccount);
-        if (Objects.isNull(userTvDTO))
+        log.info("大屏解绑，通过大屏账号查询大屏账号信息，结果 userTvDTO ==>> {}", userTvDTO);
+        if (Objects.isNull(userTvDTO.getId()))
            throw new EntityNotFoundException(UserTvDTO.class, "PlatformAccount", GlobeExceptionMsg.IPTV_IS_NULL);
+        MemberDTO memberDTO = this.memberService.findByCode(memberCode);
+        log.info("大屏解绑，通过会员code查询会员信息，结果memberDTO==>>{}", memberDTO);
        // 解绑（置空大屏信息）
-        MemberDTO _memberDTO = this.minaUnbind_(this.findMemberByCode(memberCode));
+        log.info("开始置空会员的user_iptv_id ==>> {}", memberDTO);
+        MemberDTO _memberDTO = this.minaUnbind_(memberDTO);
        if (Objects.isNull(_memberDTO)) {
            _memberDTO = memberDTO;
        }
+        log.info("会员信息置空大屏的结果，_memberDTO ==>> {}", _memberDTO);
        // 置空主账号
+        log.info("开始置空大屏账号的主会员priorityMemberCode");
        UserTvDTO _userTvDTO = this.resetMainAccount(memberCode, userTvDTO.getId(), autoModel, bindMemberCode);
        if (Objects.isNull(_userTvDTO)){
            _userTvDTO = userTvDTO;
        }
+        log.info("大屏账号置空主会员的结果，_userTvDTO ==>> {}", _userTvDTO);
        // 同步至iptv
+        log.info("开始同步解绑，参数 ==>> {} ",new MemberAndUserTvDTO(_memberDTO, _userTvDTO));
        ((UserOperationServiceImpl)AopContext.currentProxy()).asyncUnbind(new MemberAndUserTvDTO(_memberDTO, _userTvDTO));
    }
@@ -1258,17 +1266,23 @@ public class UserOperationServiceImpl implements UserOperationService {
    private UserTvDTO resetMainAccount(String memberCode, Long id, Boolean autoModel, String bindMemberCode) {
        UserTvDTO userTvDTO = this.userTvService.findByPriorityMemberCode(memberCode);
-        if (Objects.nonNull(userTvDTO)) {
+        log.info("大屏解绑，重置大屏账号的主会员，查看当前会员是否是主账号 ==>>memberCode ==>> {} || 大屏账号 ==>> userTvDTO  ==>> {}", userTvDTO);
+        if (Objects.nonNull(userTvDTO.getId())) {
+            log.info("主账号存在");
            if (StringUtils.isBlank(bindMemberCode)) {
                // 有其他绑定的小程序会员，排除自己
-                List<MemberDTO> memberDTOList = this.memberService.findByUserIptvId(id);
+                /*List<MemberDTO> memberDTOList = this.memberService.findByUserIptvId(id);
+                log.info("后台指定一个默认主会员，通过大屏id查询到的绑定的小屏会员memberDTOList ==>> {}", memberDTOList);
                if (!CollectionUtils.isEmpty(memberDTOList)) {
+                    Long memberId = userTvDTO.getMemberId();
+                    MemberDTO memberDTO1 = this.memberService.findById(memberId);
                    List<MemberDTO> collect =
                            memberDTOList.stream().filter(memberDTO ->
-                                    !memberDTO.getCode().equalsIgnoreCase(memberCode)).collect(Collectors.toList());
+                                    !memberDTO.getCode().equalsIgnoreCase(memberCode) &&
+                                    !memberDTO.getCode().equalsIgnoreCase(memberDTO1.getCode())).collect(Collectors.toList());
+                    log.info("过滤掉当前需要解绑的会员以及绑定的大屏会员之后剩余的会员列表 ==>> {}", memberDTOList);
                    if (!CollectionUtils.isEmpty(collect)) {
@@ -1282,6 +1296,7 @@ public class UserOperationServiceImpl implements UserOperationService {
                        // 绑定新的主账号
                        UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, memberDTOList.get(0).getCode(), "manual");
+                        log.info("绑定新的主账号 ==>> _userTvDTO ==>> {}", _userTvDTO);
                        return _userTvDTO;
@@ -1289,12 +1304,19 @@ public class UserOperationServiceImpl implements UserOperationService {
                } else {
+                    log.info("无其他绑定的小屏会员信息 ");
                    // 绑定新的主账号
                    UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, null, "manual");
+                    log.info("绑定新的主账号 ==>> _userTvDTO ==>> {}", _userTvDTO);
                    return _userTvDTO;
-                }
+                }*/
+                log.info("无其他绑定的小屏会员信息 ");
+                // 绑定新的主账号
+                UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, null, "manual");
+                log.info("绑定新的主账号 ==>> _userTvDTO ==>> {}", _userTvDTO);
+                return _userTvDTO;
            } else {
@@ -1328,6 +1350,7 @@ public class UserOperationServiceImpl implements UserOperationService {
        memberDTOS.setUserIptvId(null);
        memberDTOS.setBindIptvPlatformType(null);
        BeanUtils.copyProperties(memberDTOS, member);
+        log.info("大屏绑定，置空绑定的大屏信息, member ==>> {}", member);
        MemberDTO memberDTO = this.memberService.update(member);
        return memberDTO;
    }