Commit fb467741 fb46774138c262ea10c64ae537ecf864d4e7c5e1 by xianghan

1.update

1 parent ad6df716
...@@ -93,6 +93,8 @@ public class MemberProfileServiceImpl implements MemberProfileService { ...@@ -93,6 +93,8 @@ public class MemberProfileServiceImpl implements MemberProfileService {
93 } else { 93 } else {
94 resources.setId(null); 94 resources.setId(null);
95 } 95 }
96
97 resources.setMemberId(memberId);
96 memberProfile.copy(resources); 98 memberProfile.copy(resources);
97 MemberProfileRepository.save(memberProfile); 99 MemberProfileRepository.save(memberProfile);
98 } 100 }
......
...@@ -132,8 +132,7 @@ public class MemberServiceImpl implements MemberService { ...@@ -132,8 +132,7 @@ public class MemberServiceImpl implements MemberService {
132 public void update(Member resources) { 132 public void update(Member resources) {
133 try { 133 try {
134 Member member = memberRepository.findByCode(resources.getCode()).orElseGet(Member::new); 134 Member member = memberRepository.findByCode(resources.getCode()).orElseGet(Member::new);
135 ValidationUtil.isNull( member.getId(),"Member","id",member.getId()); 135 if (Objects.nonNull(member.getId())) {
136 if (Objects.nonNull(member)) {
137 Long id = member.getId(); 136 Long id = member.getId();
138 resources.setId(id); 137 resources.setId(id);
139 138
......
...@@ -101,6 +101,8 @@ public class UserWeixinServiceImpl implements UserWeixinService { ...@@ -101,6 +101,8 @@ public class UserWeixinServiceImpl implements UserWeixinService {
101 String memberCode = resources.getMemberCode(); 101 String memberCode = resources.getMemberCode();
102 MemberDTO memberDTO = this.memberService.getByCode(memberCode); 102 MemberDTO memberDTO = this.memberService.getByCode(memberCode);
103 resources.setMemberId(memberDTO.getId()); 103 resources.setMemberId(memberDTO.getId());
104 } else {
105 resources.setMemberId(userWeixin.getMemberId());
104 } 106 }
105 resources.setId(userWeixin.getId()); 107 resources.setId(userWeixin.getId());
106 BeanUtils.copyProperties(resources,userWeixin); 108 BeanUtils.copyProperties(resources,userWeixin);
......