同步修改会员信息

@@ -89,6 +89,10 @@ public class MemberProfile implements Serializable {
     @Column(name = "district")
     private String district;
 
+    //头像
+    @Transient
+    private String avatarUrl;
+
     // 描述
     @Column(name = "description")
     private String description;

@@ -78,6 +78,14 @@ public class MemberProfileController {
         return ResultInfo.success();
     }
 
+    @Log
+    @PutMapping
+    @ApiOperation("修改MemberProfile")
+    public ResultInfo updateMemberProfileAndMember(@Validated @RequestBody MemberProfile resources) {
+        this.MemberProfileService.updateMemberProfileAndMember(resources);
+        return ResultInfo.success();
+    }
+
 
     @Log
     @DeleteMapping(value = "/delete/{id}")

@@ -44,4 +44,6 @@ public interface MemberProfileService {
     void delete(Long id);
 
     MemberProfileDTO findByMemberId(Long memberId);
+
+    void updateMemberProfileAndMember(MemberProfile resources);
 }

 package com.topdraw.business.module.member.profile.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.topdraw.aspect.AsyncMqSend;
+import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.profile.domain.MemberProfile;
 import com.topdraw.business.module.member.profile.domain.MemberProfileBuild;
+import com.topdraw.business.module.member.repository.MemberRepository;
+import com.topdraw.utils.StringUtils;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.member.profile.repository.MemberProfileRepository;
 import com.topdraw.business.module.member.profile.service.MemberProfileService;
@@ -20,6 +24,8 @@ import org.springframework.util.Assert;
 import com.topdraw.utils.PageUtil;
 import com.topdraw.utils.QueryHelp;
 
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -36,6 +42,9 @@ public class MemberProfileServiceImpl implements MemberProfileService {
     private MemberProfileRepository MemberProfileRepository;
 
     @Autowired
+    private MemberRepository memberRepository;
+
+    @Autowired
     private MemberProfileMapper MemberProfileMapper;
 
 
@@ -105,5 +114,31 @@ public class MemberProfileServiceImpl implements MemberProfileService {
         return null;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateMemberProfileAndMember(MemberProfile resources) {
+        String realname = resources.getRealname();
+        String nickNameStr = "";
+        if (StringUtils.isNotBlank(realname)) {
+            byte[] encode = Base64.getEncoder().encode(realname.getBytes(StandardCharsets.UTF_8));
+            nickNameStr = new String(encode);
+            resources.setRealname(nickNameStr);
+        }
+
+        this.MemberProfileRepository.save(resources);
+
+        //修改member相关信息
+        Long memberId = resources.getMemberId();
+        Member member = memberRepository.findById(memberId).orElseGet(Member::new);
+        ValidationUtil.isNull(member.getId(),"member","id", memberId);
+
+        member.setNickname(nickNameStr);
+        member.setGender(resources.getGender());
+        member.setBirthday(DateUtil.format(resources.getBirthday(), "yyyy-MM-dd"));
+        member.setAvatarUrl(resources.getAvatarUrl());
+
+        memberRepository.save(member);
+        //memberService.update(member);
+    }
 
 }