Commit 88a0d220 88a0d2202ab3c7a2060f0230f0e65b1aad4282c6 by 鲁二龙

同步修改会员信息

1 parent 336abf9f
...@@ -89,6 +89,10 @@ public class MemberProfile implements Serializable { ...@@ -89,6 +89,10 @@ public class MemberProfile implements Serializable {
89 @Column(name = "district") 89 @Column(name = "district")
90 private String district; 90 private String district;
91 91
92 //头像
93 @Transient
94 private String avatarUrl;
95
92 // 描述 96 // 描述
93 @Column(name = "description") 97 @Column(name = "description")
94 private String description; 98 private String description;
......
...@@ -78,6 +78,14 @@ public class MemberProfileController { ...@@ -78,6 +78,14 @@ public class MemberProfileController {
78 return ResultInfo.success(); 78 return ResultInfo.success();
79 } 79 }
80 80
81 @Log
82 @PutMapping
83 @ApiOperation("修改MemberProfile")
84 public ResultInfo updateMemberProfileAndMember(@Validated @RequestBody MemberProfile resources) {
85 this.MemberProfileService.updateMemberProfileAndMember(resources);
86 return ResultInfo.success();
87 }
88
81 89
82 @Log 90 @Log
83 @DeleteMapping(value = "/delete/{id}") 91 @DeleteMapping(value = "/delete/{id}")
......
...@@ -44,4 +44,6 @@ public interface MemberProfileService { ...@@ -44,4 +44,6 @@ public interface MemberProfileService {
44 void delete(Long id); 44 void delete(Long id);
45 45
46 MemberProfileDTO findByMemberId(Long memberId); 46 MemberProfileDTO findByMemberId(Long memberId);
47
48 void updateMemberProfileAndMember(MemberProfile resources);
47 } 49 }
......
1 package com.topdraw.business.module.member.profile.service.impl; 1 package com.topdraw.business.module.member.profile.service.impl;
2 2
3 import cn.hutool.core.date.DateUtil;
3 import com.topdraw.aspect.AsyncMqSend; 4 import com.topdraw.aspect.AsyncMqSend;
5 import com.topdraw.business.module.member.domain.Member;
4 import com.topdraw.business.module.member.profile.domain.MemberProfile; 6 import com.topdraw.business.module.member.profile.domain.MemberProfile;
5 import com.topdraw.business.module.member.profile.domain.MemberProfileBuild; 7 import com.topdraw.business.module.member.profile.domain.MemberProfileBuild;
8 import com.topdraw.business.module.member.repository.MemberRepository;
9 import com.topdraw.utils.StringUtils;
6 import com.topdraw.utils.ValidationUtil; 10 import com.topdraw.utils.ValidationUtil;
7 import com.topdraw.business.module.member.profile.repository.MemberProfileRepository; 11 import com.topdraw.business.module.member.profile.repository.MemberProfileRepository;
8 import com.topdraw.business.module.member.profile.service.MemberProfileService; 12 import com.topdraw.business.module.member.profile.service.MemberProfileService;
...@@ -20,6 +24,8 @@ import org.springframework.util.Assert; ...@@ -20,6 +24,8 @@ import org.springframework.util.Assert;
20 import com.topdraw.utils.PageUtil; 24 import com.topdraw.utils.PageUtil;
21 import com.topdraw.utils.QueryHelp; 25 import com.topdraw.utils.QueryHelp;
22 26
27 import java.nio.charset.StandardCharsets;
28 import java.util.Base64;
23 import java.util.List; 29 import java.util.List;
24 import java.util.Map; 30 import java.util.Map;
25 import java.util.Optional; 31 import java.util.Optional;
...@@ -36,6 +42,9 @@ public class MemberProfileServiceImpl implements MemberProfileService { ...@@ -36,6 +42,9 @@ public class MemberProfileServiceImpl implements MemberProfileService {
36 private MemberProfileRepository MemberProfileRepository; 42 private MemberProfileRepository MemberProfileRepository;
37 43
38 @Autowired 44 @Autowired
45 private MemberRepository memberRepository;
46
47 @Autowired
39 private MemberProfileMapper MemberProfileMapper; 48 private MemberProfileMapper MemberProfileMapper;
40 49
41 50
...@@ -105,5 +114,31 @@ public class MemberProfileServiceImpl implements MemberProfileService { ...@@ -105,5 +114,31 @@ public class MemberProfileServiceImpl implements MemberProfileService {
105 return null; 114 return null;
106 } 115 }
107 116
117 @Override
118 @Transactional(rollbackFor = Exception.class)
119 public void updateMemberProfileAndMember(MemberProfile resources) {
120 String realname = resources.getRealname();
121 String nickNameStr = "";
122 if (StringUtils.isNotBlank(realname)) {
123 byte[] encode = Base64.getEncoder().encode(realname.getBytes(StandardCharsets.UTF_8));
124 nickNameStr = new String(encode);
125 resources.setRealname(nickNameStr);
126 }
127
128 this.MemberProfileRepository.save(resources);
129
130 //修改member相关信息
131 Long memberId = resources.getMemberId();
132 Member member = memberRepository.findById(memberId).orElseGet(Member::new);
133 ValidationUtil.isNull(member.getId(),"member","id", memberId);
134
135 member.setNickname(nickNameStr);
136 member.setGender(resources.getGender());
137 member.setBirthday(DateUtil.format(resources.getBirthday(), "yyyy-MM-dd"));
138 member.setAvatarUrl(resources.getAvatarUrl());
139
140 memberRepository.save(member);
141 //memberService.update(member);
142 }
108 143
109 } 144 }
......