Commit 4bc1f4cf 4bc1f4cfdf88aceb08590ad31e1bece0b58ccc67 by xianghan

1.同步master,修改小屏解绑bug

1 parent a1b52b0e
......@@ -68,6 +68,7 @@ public class UserTvServiceImpl implements UserTvService {
}
@Override
@Transactional(rollbackFor = Exception.class)
public void doUpdatePriorityMemberCode(UserTv userTv) {
this.userTvRepository.updatePriorityMemberCode(userTv);
}
......
......@@ -196,7 +196,7 @@ public class UserOperationServiceImpl implements UserOperationService {
}
@Transactional(propagation = Propagation.SUPPORTS, rollbackFor = Exception.class)
public void asyncAppletBind(MemberAndUserTvDTO memberAndUserTvDTO) {
public void asyncMinaBind(MemberAndUserTvDTO memberAndUserTvDTO) {
log.info("asyncAppletBind ==>> 小程序绑定大屏,参数 memberAndUserTvDTO ==>> {}", memberAndUserTvDTO);
UserTvDTO userTvDTO = memberAndUserTvDTO.getUserTvDTO();
MemberDTO memberDTO = memberAndUserTvDTO.getMemberDTO();
......@@ -238,11 +238,11 @@ public class UserOperationServiceImpl implements UserOperationService {
String platformAccount = userTvDTO.getPlatformAccount();
UserTvDTO _userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
_userTvDTO.setPriorityMemberCode(null);
_userTvDTO.setPriorityMemberCode(userTvDTO.getPriorityMemberCode());
//
this.unbindPriorityMemberCode(_userTvDTO);
String code = memberDTO.getCode();
MemberDTO _memberDTO = this.memberService.findByCode(code);
this.unbindUserIpTv(_memberDTO);
......@@ -368,6 +368,7 @@ public class UserOperationServiceImpl implements UserOperationService {
UserTv userTv = new UserTv();
userTv.setId(_userTvDTO.getId());
userTv.setPlatformAccount(platformAccount);
userTv.setPriorityMemberCode(priorityMemberCode);
log.info("开始修改大屏数据,userTv ==>>{}", userTv);
this.userTvService.doUpdatePriorityMemberCode(userTv);
......