Commit c88db290 c88db29044e006c9cabaa4cc314413a098abf77b by xianghan

1.修复修改会员属性信息时如果性别为空时程序异常

1 parent b2c77c39
......@@ -171,30 +171,35 @@ public class MemberProfileServiceImpl implements MemberProfileService {
log.info("MemberProfileServiceImpl ==>> updateMemberProfileAndMember ==>> resources ===>> [{}]",resources);
MemberProfileDTO memberProfileDTO = this.update(resources);
// 同步会员信息
this.synchronizedMemberData(resources, memberDTO);
return memberProfileDTO;
}
private void synchronizedMemberData(MemberProfile memberProfile, MemberDTO memberDTO) {
log.info("updateMemberProfileAndMember ==>> resources ==>> [{}]",memberProfile);
log.info("updateMemberProfileAndMember ==>> resources ==>> [{}]",memberProfileDTO);
Member member = new Member();
member.setId(memberDTO.getId());
member.setCode(memberDTO.getCode());
if(StringUtils.isNotBlank(memberProfile.getRealname())) {
member.setNickname(memberProfile.getRealname());
if(StringUtils.isNotBlank(memberProfileDTO.getRealname())) {
member.setNickname(memberProfileDTO.getRealname());
} else {
member.setNickname(memberDTO.getNickname());
}
if(Objects.nonNull(memberProfile.getGender()) && memberProfile.getGender() != -1) {
member.setGender(memberProfile.getGender());
if(Objects.nonNull(memberProfileDTO.getGender()) && memberProfileDTO.getGender() != -1) {
member.setGender(memberProfileDTO.getGender());
} else {
member.setGender(memberDTO.getGender());
}
if(StringUtils.isNotBlank(memberProfile.getBirthday())) {
member.setBirthday(memberProfile.getBirthday());
if(StringUtils.isNotBlank(memberProfileDTO.getBirthday())) {
member.setBirthday(memberProfileDTO.getBirthday());
} else {
member.setBirthday(memberDTO.getBirthday());
}
if(StringUtils.isNotBlank(memberProfile.getAvatarUrl())) {
member.setAvatarUrl(memberProfile.getAvatarUrl());
if(StringUtils.isNotBlank(memberProfileDTO.getAvatarUrl())) {
member.setAvatarUrl(memberProfileDTO.getAvatarUrl());
} else {
member.setAvatarUrl(memberDTO.getAvatarUrl());
}
this.memberService.doUpdateMemberAvatarUrlAndNicknameAndGender(member);
return memberProfileDTO;
}
}
......