Skip to content

向汉 / uc-consumer

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 4bc1f4cf 4bc1f4cfdf88aceb08590ad31e1bece0b58ccc67 by xianghan
Options

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

1 parent a1b52b0e
Inline Side-by-side
Showing 2 changed files with 5 additions and 3 deletions
...@@ -68,6 +68,7 @@ public class UserTvServiceImpl implements UserTvService { ...@@ -68,6 +68,7 @@ public class UserTvServiceImpl implements UserTvService {
68 } 68 }
69 69
70 @Override 70 @Override
71 @Transactional(rollbackFor = Exception.class)
71 public void doUpdatePriorityMemberCode(UserTv userTv) { 72 public void doUpdatePriorityMemberCode(UserTv userTv) {
72 this.userTvRepository.updatePriorityMemberCode(userTv); 73 this.userTvRepository.updatePriorityMemberCode(userTv);
73 } 74 }
......
...@@ -196,7 +196,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -196,7 +196,7 @@ public class UserOperationServiceImpl implements UserOperationService {
196 } 196 }
197 197
198 @Transactional(propagation = Propagation.SUPPORTS, rollbackFor = Exception.class) 198 @Transactional(propagation = Propagation.SUPPORTS, rollbackFor = Exception.class)
199 public void asyncAppletBind(MemberAndUserTvDTO memberAndUserTvDTO) { 199 public void asyncMinaBind(MemberAndUserTvDTO memberAndUserTvDTO) {
200 log.info("asyncAppletBind ==>> 小程序绑定大屏，参数 memberAndUserTvDTO ==>> {}", memberAndUserTvDTO); 200 log.info("asyncAppletBind ==>> 小程序绑定大屏，参数 memberAndUserTvDTO ==>> {}", memberAndUserTvDTO);
201 UserTvDTO userTvDTO = memberAndUserTvDTO.getUserTvDTO(); 201 UserTvDTO userTvDTO = memberAndUserTvDTO.getUserTvDTO();
202 MemberDTO memberDTO = memberAndUserTvDTO.getMemberDTO(); 202 MemberDTO memberDTO = memberAndUserTvDTO.getMemberDTO();
...@@ -238,11 +238,11 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -238,11 +238,11 @@ public class UserOperationServiceImpl implements UserOperationService {
238 238
239 String platformAccount = userTvDTO.getPlatformAccount(); 239 String platformAccount = userTvDTO.getPlatformAccount();
240 UserTvDTO _userTvDTO = this.userTvService.findByPlatformAccount(platformAccount); 240 UserTvDTO _userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
241 241 _userTvDTO.setPriorityMemberCode(userTvDTO.getPriorityMemberCode());
242 _userTvDTO.setPriorityMemberCode(null);
243 // 242 //
244 this.unbindPriorityMemberCode(_userTvDTO); 243 this.unbindPriorityMemberCode(_userTvDTO);
245 244
245
246 String code = memberDTO.getCode(); 246 String code = memberDTO.getCode();
247 MemberDTO _memberDTO = this.memberService.findByCode(code); 247 MemberDTO _memberDTO = this.memberService.findByCode(code);
248 this.unbindUserIpTv(_memberDTO); 248 this.unbindUserIpTv(_memberDTO);
...@@ -368,6 +368,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -368,6 +368,7 @@ public class UserOperationServiceImpl implements UserOperationService {
368 368
369 UserTv userTv = new UserTv(); 369 UserTv userTv = new UserTv();
370 userTv.setId(_userTvDTO.getId()); 370 userTv.setId(_userTvDTO.getId());
371 userTv.setPlatformAccount(platformAccount);
371 userTv.setPriorityMemberCode(priorityMemberCode); 372 userTv.setPriorityMemberCode(priorityMemberCode);
372 log.info("开始修改大屏数据，userTv ==>>{}", userTv); 373 log.info("开始修改大屏数据，userTv ==>>{}", userTv);
373 this.userTvService.doUpdatePriorityMemberCode(userTv); 374 this.userTvService.doUpdatePriorityMemberCode(userTv);
......