Commit 74d95364 74d953640b857b51387221e02e025cce71528b33 by xianghan

1.修复大屏换绑bug

1 parent e96581b2
......@@ -756,15 +756,24 @@ public class UserOperationController {
@ApiOperation("大屏更换主账号")
@AnonymousAccess
public ResultInfo changeMainAccount(@Validated(value = {UpdateGroup.class}) @RequestBody BindBean resources) {
log.info("UserOperationController ==> changeMainAccount ==>> param ==> [{}]",resources);
log.info("大屏更换主账号,参数 [changeMainAccount# ==> {}]",resources);
Long memberId = resources.getMemberId();
// Long memberId = resources.getMemberId();
String memberCode = resources.getMemberCode();
if (StringUtils.isBlank(memberCode) && Objects.nonNull(memberId)) {
/* if (StringUtils.isBlank(memberCode) && Objects.nonNull(memberId)) {
memberCode = this.memberService.findCodeById(memberId);
} else if (StringUtils.isNotBlank(memberCode) && Objects.isNull(memberId)) {
MemberDTO memberDTO = this.memberService.findByCode(memberCode);
memberCode = memberDTO.getCode();
}*/
if (StringUtils.isBlank(memberCode))
return ResultInfo.failure("会员code不得为空");
MemberDTO memberDTO = this.memberService.findByCode(memberCode);
if (Objects.isNull(memberDTO.getId())) {
log.error("大屏更换主账号失败,会员信息不存在, changeMainAccount# ==> {}", memberCode);
return ResultInfo.failure("会员信息不存在");
}
String platformAccount = resources.getPlatformAccount();
......
......@@ -917,11 +917,6 @@ public class UserOperationServiceImpl implements UserOperationService {
// 会员编码
String memberCode = resources.getMemberCode();
MemberDTO memberDTO = this.memberService.findByCode(memberCode);
if (Objects.isNull(memberDTO.getId())) {
log.error("会员信息不存在, memberCode ==>> {}", memberCode);
return false;
}
String platformAccount = resources.getPlatformAccount();
UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
......@@ -936,7 +931,9 @@ public class UserOperationServiceImpl implements UserOperationService {
UserTv userTv = new UserTv();
userTv.setId(userTvDTO.getId());
userTv.setPriorityMemberCode(memberCode);
userTvDTO = this.userTvService.doUpdatePriorityMemberCode(userTv);
this.userTvService.doUpdatePriorityMemberCode(userTv);
userTvDTO.setPriorityMemberCode(memberCode);
// 同步至iptv
((UserOperationServiceImpl)AopContext.currentProxy()).asyncUserTvChangeMainAccount(userTvDTO);
......