Skip to content

向汉 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 4042c6ad 4042c6ad6e366db333ddef69d3683d9cea4fe4dc by xianghan
Options

1.修改会员信息时修改查询逻辑

1 parent d4eefb7a
Inline Side-by-side
Showing 2 changed files with 9 additions and 6 deletions
...@@ -77,10 +77,12 @@ public class MemberController { ...@@ -77,10 +77,12 @@ public class MemberController {
77 77
78 Long memberId = resources.getId(); 78 Long memberId = resources.getId();
79 String code1 = resources.getCode(); 79 String code1 = resources.getCode();
80 80 MemberDTO memberDTO = null;
81 MemberDTO memberDTO = this.memberService.getByCode(code1); 81 if (StringUtils.hasText(code1)) {
82 if (Objects.isNull(memberDTO.getCode())) { 82 memberDTO = this.memberService.getByCode(code1);
83 memberDTO = this.memberService.findById(memberId); 83 if (Objects.isNull(memberDTO.getCode()) && Objects.nonNull(memberId)) {
84 memberDTO = this.memberService.findById(memberId);
85 }
84 } 86 }
85 87
86 String code = memberDTO.getCode(); 88 String code = memberDTO.getCode();
......
...@@ -124,10 +124,11 @@ public class MemberServiceImpl implements MemberService { ...@@ -124,10 +124,11 @@ public class MemberServiceImpl implements MemberService {
124 @Transactional(rollbackFor = Exception.class) 124 @Transactional(rollbackFor = Exception.class)
125 @AsyncMqSend() 125 @AsyncMqSend()
126 public void update(Member resources) { 126 public void update(Member resources) {
127 RLock rLock = this.redissonClient.getLock("member::update::id" + resources.getId().toString()); 127 RLock rLock = this.redissonClient.getLock("member::update::code" + resources.getCode().toString());
128 try { 128 try {
129 RedissonUtil.lock(rLock); 129 RedissonUtil.lock(rLock);
130 Member member = memberRepository.findById(resources.getId()).orElseGet(Member::new); 130 // Member member = memberRepository.findById(resources.getId()).orElseGet(Member::new);
131 Member member = memberRepository.findFirstByCode(resources.getCode()).orElseGet(Member::new);
131 ValidationUtil.isNull(member.getId(), "Member", "id", resources.getId()); 132 ValidationUtil.isNull(member.getId(), "Member", "id", resources.getId());
132 member.copy(resources); 133 member.copy(resources);
133 this.save(member); 134 this.save(member);
......