Skip to content

张云鹏 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 74d95364 74d953640b857b51387221e02e025cce71528b33 by xianghan
Options

1.修复大屏换绑bug

1 parent e96581b2
Inline Side-by-side
Showing 2 changed files with 15 additions and 9 deletions
...@@ -756,15 +756,24 @@ public class UserOperationController { ...@@ -756,15 +756,24 @@ public class UserOperationController {
756 @ApiOperation("大屏更换主账号") 756 @ApiOperation("大屏更换主账号")
757 @AnonymousAccess 757 @AnonymousAccess
758 public ResultInfo changeMainAccount(@Validated(value = {UpdateGroup.class}) @RequestBody BindBean resources) { 758 public ResultInfo changeMainAccount(@Validated(value = {UpdateGroup.class}) @RequestBody BindBean resources) {
759 log.info("UserOperationController ==> changeMainAccount ==>> param ==> [{}]",resources); 759 log.info("大屏更换主账号，参数 [changeMainAccount# ==> {}]",resources);
760 760
761 Long memberId = resources.getMemberId(); 761 // Long memberId = resources.getMemberId();
762 String memberCode = resources.getMemberCode(); 762 String memberCode = resources.getMemberCode();
763 if (StringUtils.isBlank(memberCode) && Objects.nonNull(memberId)) { 763 /* if (StringUtils.isBlank(memberCode) && Objects.nonNull(memberId)) {
764 memberCode = this.memberService.findCodeById(memberId); 764 memberCode = this.memberService.findCodeById(memberId);
765 } else if (StringUtils.isNotBlank(memberCode) && Objects.isNull(memberId)) { 765 } else if (StringUtils.isNotBlank(memberCode) && Objects.isNull(memberId)) {
766 MemberDTO memberDTO = this.memberService.findByCode(memberCode); 766 MemberDTO memberDTO = this.memberService.findByCode(memberCode);
767 memberCode = memberDTO.getCode(); 767 memberCode = memberDTO.getCode();
768 }*/
769
770 if (StringUtils.isBlank(memberCode))
771 return ResultInfo.failure("会员code不得为空");
772
773 MemberDTO memberDTO = this.memberService.findByCode(memberCode);
774 if (Objects.isNull(memberDTO.getId())) {
775 log.error("大屏更换主账号失败，会员信息不存在, changeMainAccount# ==> {}", memberCode);
776 return ResultInfo.failure("会员信息不存在");
768 } 777 }
769 778
770 String platformAccount = resources.getPlatformAccount(); 779 String platformAccount = resources.getPlatformAccount();
......
...@@ -917,11 +917,6 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -917,11 +917,6 @@ public class UserOperationServiceImpl implements UserOperationService {
917 917
918 // 会员编码 918 // 会员编码
919 String memberCode = resources.getMemberCode(); 919 String memberCode = resources.getMemberCode();
920 MemberDTO memberDTO = this.memberService.findByCode(memberCode);
921 if (Objects.isNull(memberDTO.getId())) {
922 log.error("会员信息不存在, memberCode ==>> {}", memberCode);
923 return false;
924 }
925 920
926 String platformAccount = resources.getPlatformAccount(); 921 String platformAccount = resources.getPlatformAccount();
927 UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount); 922 UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
...@@ -936,7 +931,9 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -936,7 +931,9 @@ public class UserOperationServiceImpl implements UserOperationService {
936 UserTv userTv = new UserTv(); 931 UserTv userTv = new UserTv();
937 userTv.setId(userTvDTO.getId()); 932 userTv.setId(userTvDTO.getId());
938 userTv.setPriorityMemberCode(memberCode); 933 userTv.setPriorityMemberCode(memberCode);
939 userTvDTO = this.userTvService.doUpdatePriorityMemberCode(userTv); 934 this.userTvService.doUpdatePriorityMemberCode(userTv);
935
936 userTvDTO.setPriorityMemberCode(memberCode);
940 // 同步至iptv 937 // 同步至iptv
941 ((UserOperationServiceImpl)AopContext.currentProxy()).asyncUserTvChangeMainAccount(userTvDTO); 938 ((UserOperationServiceImpl)AopContext.currentProxy()).asyncUserTvChangeMainAccount(userTvDTO);
942 939
......