Commit 4042c6ad 4042c6ad6e366db333ddef69d3683d9cea4fe4dc by xianghan

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

1 parent d4eefb7a
......@@ -77,10 +77,12 @@ public class MemberController {
Long memberId = resources.getId();
String code1 = resources.getCode();
MemberDTO memberDTO = this.memberService.getByCode(code1);
if (Objects.isNull(memberDTO.getCode())) {
memberDTO = this.memberService.findById(memberId);
MemberDTO memberDTO = null;
if (StringUtils.hasText(code1)) {
memberDTO = this.memberService.getByCode(code1);
if (Objects.isNull(memberDTO.getCode()) && Objects.nonNull(memberId)) {
memberDTO = this.memberService.findById(memberId);
}
}
String code = memberDTO.getCode();
......
......@@ -124,10 +124,11 @@ public class MemberServiceImpl implements MemberService {
@Transactional(rollbackFor = Exception.class)
@AsyncMqSend()
public void update(Member resources) {
RLock rLock = this.redissonClient.getLock("member::update::id" + resources.getId().toString());
RLock rLock = this.redissonClient.getLock("member::update::code" + resources.getCode().toString());
try {
RedissonUtil.lock(rLock);
Member member = memberRepository.findById(resources.getId()).orElseGet(Member::new);
// Member member = memberRepository.findById(resources.getId()).orElseGet(Member::new);
Member member = memberRepository.findFirstByCode(resources.getCode()).orElseGet(Member::new);
ValidationUtil.isNull(member.getId(), "Member", "id", resources.getId());
member.copy(resources);
this.save(member);
......