Skip to content

张云鹏 / uc-consumer

Go to a project
Toggle navigation
Toggle navigation pinning
Commit befd31ce befd31ce611ff902153f87842e60323947b43f33 by xianghan
Options

1.update

1 parent 2bf41a44
Inline Side-by-side
Showing 1 changed file with 21 additions and 2 deletions
......@@ -258,6 +258,16 @@ public class UserOperationServiceImpl implements UserOperationService {
}
} else {
String memberCode = userWeixinDTO.getMemberCode();
if (StringUtils.isNotBlank(memberCode)) {
Member member = new Member();
member.setCode(memberCode);
MemberDTO memberDTO1 = this.memberService.create(member);
userWeixinDTO.setMemberId(memberDTO1.getId());
}
}
userWeixinDTO.setId(_userWeixinDTO.getId());
this.updateWeixin(_userWeixinDTO, userWeixinDTO);
......@@ -341,7 +351,7 @@ public class UserOperationServiceImpl implements UserOperationService {
UserWeixinDTO userWeixinDTO1 = this.userWeixinService.findFirstByUnionId(unionid);
// 有其他账号
if (Objects.nonNull(userWeixinDTO1)) {
if (Objects.nonNull(userWeixinDTO1.getId())) {
Long memberId = userWeixinDTO1.getMemberId();
if (Objects.nonNull(memberId)) {
......@@ -374,7 +384,7 @@ public class UserOperationServiceImpl implements UserOperationService {
UserWeixinDTO userWeixinDTO1 = this.userWeixinService.findFirstByUnionId(unionid);
// 有其他账号
if (Objects.nonNull(userWeixinDTO1)) {
if (Objects.nonNull(userWeixinDTO1.getId())) {
Long memberId = userWeixinDTO1.getMemberId();
if (Objects.nonNull(memberId)) {
......@@ -394,6 +404,15 @@ public class UserOperationServiceImpl implements UserOperationService {
userWeixinDTO.setMemberId(_memberDTO1.getId());
}
} else {
MemberDTO memberDTO1 = memberAndWeixinUserDTO.getMemberDTO();
Member member = new Member();
BeanUtils.copyProperties(memberDTO1, member);
member.setId(null);
MemberDTO _memberDTO1 = this.memberService.create(member);
userWeixinDTO.setMemberId(_memberDTO1.getId());
}
this.createWeixin(userWeixinDTO);
......