diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java
index b03a7d268..3322b65fc 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java
@@ -128,11 +128,12 @@ public class MemberController extends BaseController {
* http://localhost:8080/uniapp/member/saveUserInfo
*/
@PostMapping("/saveUserInfo")
- public RestApiResponse> saveUserInfo(@RequestBody MemberRegisterDTO dto) {
+ public RestApiResponse> saveUserInfo(HttpServletRequest request, @RequestBody MemberRegisterDTO dto) {
logger.info("接受前端用户信息并处理 param:{}", JSONObject.toJSONString(dto));
RestApiResponse> response = null;
try {
- memberService.handleUserInfo(dto);
+ String memberId = getMemberIdByAuthorization(request);
+ memberService.handleUserInfo(memberId, dto);
response = new RestApiResponse<>();
} catch (Exception e) {
logger.error("处理用户信息异常", e);
diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
index a645dd754..63c4f784f 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
@@ -223,18 +223,24 @@ public class MemberService {
/**
* 处理用户信息
*
- * @param dto 用户个人信息
+ * @param memberId
+ * @param dto 用户个人信息
*/
- public void handleUserInfo(MemberRegisterDTO dto) {
+ public void handleUserInfo(String memberId, MemberRegisterDTO dto) {
// 通过用户手机号查询数据库,如果数据库中存在,则更新
- MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getMobileNumber());
+ // MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getMobileNumber());
+ MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMemberId(memberId);
if (Objects.nonNull(memberBasicInfo)) {
- MemberBasicInfo memberInfo = MemberBasicInfo.builder()
- .avatarUrl(dto.getAvatarUrl())
- .mobileNumber(dto.getMobileNumber())
- .nickName(dto.getNickName())
- .build();
- memberBasicInfoService.updateMemberBasicInfo(memberInfo);
+ if (StringUtils.isNotBlank(dto.getAvatarUrl())) {
+ memberBasicInfo.setAvatarUrl(dto.getAvatarUrl());
+ }
+ if (StringUtils.isNotBlank(dto.getMobileNumber())) {
+ memberBasicInfo.setMobileNumber(dto.getMobileNumber());
+ }
+ if (StringUtils.isNotBlank(dto.getNickName())) {
+ memberBasicInfo.setNickName(dto.getNickName());
+ }
+ memberBasicInfoService.updateMemberBasicInfo(memberBasicInfo);
}
}
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
index 48e4606d6..842b96298 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
@@ -331,7 +331,6 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
@Override
public PileInfoVO selectPileInfoBySn(String pileSn) {
- // TODO 换成缓存方法
PileBasicInfo basicInfo = selectPileBasicInfoBySN(pileSn);
if (basicInfo == null) {
return null;
diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
index 76cc6c6f2..6a3346c9e 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
@@ -165,7 +165,7 @@
FROM member_basic_info
WHERE del_flag = '0'
- and member_id = #{memberId,jdbcType=VARCHAR,jdbcType=VARCHAR}
+ and member_id = #{memberId,jdbcType=VARCHAR}