Commit c88db290 c88db29044e006c9cabaa4cc314413a098abf77b by xianghan

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

1 parent b2c77c39
...@@ -171,30 +171,35 @@ public class MemberProfileServiceImpl implements MemberProfileService { ...@@ -171,30 +171,35 @@ public class MemberProfileServiceImpl implements MemberProfileService {
171 log.info("MemberProfileServiceImpl ==>> updateMemberProfileAndMember ==>> resources ===>> [{}]",resources); 171 log.info("MemberProfileServiceImpl ==>> updateMemberProfileAndMember ==>> resources ===>> [{}]",resources);
172 MemberProfileDTO memberProfileDTO = this.update(resources); 172 MemberProfileDTO memberProfileDTO = this.update(resources);
173 // 同步会员信息 173 // 同步会员信息
174 this.synchronizedMemberData(resources, memberDTO);
175 return memberProfileDTO;
176 }
177 174
178 private void synchronizedMemberData(MemberProfile memberProfile, MemberDTO memberDTO) { 175 log.info("updateMemberProfileAndMember ==>> resources ==>> [{}]",memberProfileDTO);
179
180 log.info("updateMemberProfileAndMember ==>> resources ==>> [{}]",memberProfile);
181 176
182 Member member = new Member(); 177 Member member = new Member();
183 member.setId(memberDTO.getId()); 178 member.setId(memberDTO.getId());
184 member.setCode(memberDTO.getCode()); 179 member.setCode(memberDTO.getCode());
185 if(StringUtils.isNotBlank(memberProfile.getRealname())) { 180 if(StringUtils.isNotBlank(memberProfileDTO.getRealname())) {
186 member.setNickname(memberProfile.getRealname()); 181 member.setNickname(memberProfileDTO.getRealname());
182 } else {
183 member.setNickname(memberDTO.getNickname());
187 } 184 }
188 if(Objects.nonNull(memberProfile.getGender()) && memberProfile.getGender() != -1) { 185 if(Objects.nonNull(memberProfileDTO.getGender()) && memberProfileDTO.getGender() != -1) {
189 member.setGender(memberProfile.getGender()); 186 member.setGender(memberProfileDTO.getGender());
187 } else {
188 member.setGender(memberDTO.getGender());
190 } 189 }
191 if(StringUtils.isNotBlank(memberProfile.getBirthday())) { 190 if(StringUtils.isNotBlank(memberProfileDTO.getBirthday())) {
192 member.setBirthday(memberProfile.getBirthday()); 191 member.setBirthday(memberProfileDTO.getBirthday());
192 } else {
193 member.setBirthday(memberDTO.getBirthday());
193 } 194 }
194 if(StringUtils.isNotBlank(memberProfile.getAvatarUrl())) { 195 if(StringUtils.isNotBlank(memberProfileDTO.getAvatarUrl())) {
195 member.setAvatarUrl(memberProfile.getAvatarUrl()); 196 member.setAvatarUrl(memberProfileDTO.getAvatarUrl());
197 } else {
198 member.setAvatarUrl(memberDTO.getAvatarUrl());
196 } 199 }
197
198 this.memberService.doUpdateMemberAvatarUrlAndNicknameAndGender(member); 200 this.memberService.doUpdateMemberAvatarUrlAndNicknameAndGender(member);
201
202 return memberProfileDTO;
199 } 203 }
204
200 } 205 }
......