Commit b7c88b81 b7c88b8103e8851505e57de14f815d17a1d24967 by xianghan

1.兼容历史数据无unionid和memberId的情况

1 parent 7e7715e5
...@@ -1572,9 +1572,11 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -1572,9 +1572,11 @@ public class UserOperationServiceImpl implements UserOperationService {
1572 1572
1573 UserWeixinDTO userWeixinDTO_ = this.doCreateUserWeiXin(userWeixinDTO,memberId); 1573 UserWeixinDTO userWeixinDTO_ = this.doCreateUserWeiXin(userWeixinDTO,memberId);
1574 MemberProfileDTO memberProfileDTO = this.memberProfileService.findByMemberId(memberId); 1574 MemberProfileDTO memberProfileDTO = this.memberProfileService.findByMemberId(memberId);
1575 if (Objects.isNull(memberProfileDTO)) 1575 if (Objects.isNull(memberProfileDTO)) {
1576
1576 // 创建会员属性信息 1577 // 创建会员属性信息
1577 this.createMemberProfile(userWeixinDTO_); 1578 this.createMemberProfile(userWeixinDTO_);
1579 }
1578 1580
1579 log.info("userWeixinDTO_ ===>> {}", userWeixinDTO_); 1581 log.info("userWeixinDTO_ ===>> {}", userWeixinDTO_);
1580 return userWeixinDTO_; 1582 return userWeixinDTO_;
...@@ -1665,7 +1667,9 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -1665,7 +1667,9 @@ public class UserOperationServiceImpl implements UserOperationService {
1665 Long memberId = userWeixinDTO1.getMemberId(); 1667 Long memberId = userWeixinDTO1.getMemberId();
1666 String nickname = userWeixinDTO1.getNickname(); 1668 String nickname = userWeixinDTO1.getNickname();
1667 Integer sex = userWeixinDTO1.getGender(); 1669 Integer sex = userWeixinDTO1.getGender();
1670 MemberDTO memberDTO = this.memberService.findById(memberId);
1668 MemberProfile memberProfile = MemberProfileBuild.build(memberId, nickname, sex, null); 1671 MemberProfile memberProfile = MemberProfileBuild.build(memberId, nickname, sex, null);
1672 memberProfile.setMemberCode(memberDTO.getCode());
1669 this.memberProfileService.create(memberProfile); 1673 this.memberProfileService.create(memberProfile);
1670 } 1674 }
1671 1675
......