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 { ...@@ -258,6 +258,16 @@ public class UserOperationServiceImpl implements UserOperationService {
258 258
259 } 259 }
260 260
261 } else {
262
263 String memberCode = userWeixinDTO.getMemberCode();
264 if (StringUtils.isNotBlank(memberCode)) {
265 Member member = new Member();
266 member.setCode(memberCode);
267 MemberDTO memberDTO1 = this.memberService.create(member);
268 userWeixinDTO.setMemberId(memberDTO1.getId());
269 }
270
261 } 271 }
262 userWeixinDTO.setId(_userWeixinDTO.getId()); 272 userWeixinDTO.setId(_userWeixinDTO.getId());
263 this.updateWeixin(_userWeixinDTO, userWeixinDTO); 273 this.updateWeixin(_userWeixinDTO, userWeixinDTO);
...@@ -341,7 +351,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -341,7 +351,7 @@ public class UserOperationServiceImpl implements UserOperationService {
341 UserWeixinDTO userWeixinDTO1 = this.userWeixinService.findFirstByUnionId(unionid); 351 UserWeixinDTO userWeixinDTO1 = this.userWeixinService.findFirstByUnionId(unionid);
342 352
343 // 有其他账号 353 // 有其他账号
344 if (Objects.nonNull(userWeixinDTO1)) { 354 if (Objects.nonNull(userWeixinDTO1.getId())) {
345 355
346 Long memberId = userWeixinDTO1.getMemberId(); 356 Long memberId = userWeixinDTO1.getMemberId();
347 if (Objects.nonNull(memberId)) { 357 if (Objects.nonNull(memberId)) {
...@@ -374,7 +384,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -374,7 +384,7 @@ public class UserOperationServiceImpl implements UserOperationService {
374 UserWeixinDTO userWeixinDTO1 = this.userWeixinService.findFirstByUnionId(unionid); 384 UserWeixinDTO userWeixinDTO1 = this.userWeixinService.findFirstByUnionId(unionid);
375 385
376 // 有其他账号 386 // 有其他账号
377 if (Objects.nonNull(userWeixinDTO1)) { 387 if (Objects.nonNull(userWeixinDTO1.getId())) {
378 388
379 Long memberId = userWeixinDTO1.getMemberId(); 389 Long memberId = userWeixinDTO1.getMemberId();
380 if (Objects.nonNull(memberId)) { 390 if (Objects.nonNull(memberId)) {
...@@ -394,6 +404,15 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -394,6 +404,15 @@ public class UserOperationServiceImpl implements UserOperationService {
394 userWeixinDTO.setMemberId(_memberDTO1.getId()); 404 userWeixinDTO.setMemberId(_memberDTO1.getId());
395 405
396 } 406 }
407 } else {
408
409 MemberDTO memberDTO1 = memberAndWeixinUserDTO.getMemberDTO();
410 Member member = new Member();
411 BeanUtils.copyProperties(memberDTO1, member);
412 member.setId(null);
413 MemberDTO _memberDTO1 = this.memberService.create(member);
414 userWeixinDTO.setMemberId(_memberDTO1.getId());
415
397 } 416 }
398 417
399 this.createWeixin(userWeixinDTO); 418 this.createWeixin(userWeixinDTO);
......