Skip to content

张云鹏 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 573bb43c 573bb43cd41133b4a8393a8f2b88886ecfb41bfc by xianghan
Options

1.切换主账号时，取消已是主账号的判断条件

1 parent 202d49bc
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
...@@ -654,7 +654,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -654,7 +654,7 @@ public class UserOperationServiceImpl implements UserOperationService {
654 654
655 UserTvDTO userTvDTO = this.findByPlatformAccount(platformAccount); 655 UserTvDTO userTvDTO = this.findByPlatformAccount(platformAccount);
656 656
657 if (Objects.nonNull(userTvDTO)) { 657 /* if (Objects.nonNull(userTvDTO.getId())) {
658 if (StringUtils.isNotBlank(userTvDTO.getPriorityMemberCode()) && userTvDTO.getPriorityMemberCode().equalsIgnoreCase(memberCode)) 658 if (StringUtils.isNotBlank(userTvDTO.getPriorityMemberCode()) && userTvDTO.getPriorityMemberCode().equalsIgnoreCase(memberCode))
659 throw new BadRequestException("会员已是主账户"); 659 throw new BadRequestException("会员已是主账户");
660 660
...@@ -662,7 +662,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -662,7 +662,7 @@ public class UserOperationServiceImpl implements UserOperationService {
662 662
663 throw new EntityNotFoundException(UserTvDTO.class , "platformAccount" , GlobeExceptionMsg.IPTV_IS_NULL); 663 throw new EntityNotFoundException(UserTvDTO.class , "platformAccount" , GlobeExceptionMsg.IPTV_IS_NULL);
664 664
665 } 665 }*/
666 666
667 // 设置主会员 667 // 设置主会员
668 UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, memberCode, "manual"); 668 UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, memberCode, "manual");
......