From b0a4d23b83b9cdbdee15263acdd4e7353a8286a1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 07 八月 2024 18:19:48 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
index ca83288..05a0f8e 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
@@ -122,11 +122,14 @@
})
public ApiResponse<Member> editMember(@RequestBody EditMemberRequest editMemberRequest) {
editMemberRequest.setId(getMemberId());
+ String phone = editMemberRequest.getPhone();
//鍚屾瀵艰喘缁戝畾淇℃伅
- if(StringUtils.isNotBlank(editMemberRequest.getPhone())){
- customerUserService.syncByPhone(editMemberRequest.getPhone());
+ Member member =memberService.updMemberDetail(editMemberRequest);
+ if(StringUtils.isNotBlank(phone)){
+ customerUserService.syncByPhone(member);
+ member = memberService.getMemberInfo(member.getId());
}
- return ApiResponse.success("鏇存柊鎴愬姛",memberService.updMemberDetail(editMemberRequest));
+ return ApiResponse.success("鏇存柊鎴愬姛",member);
}
@LoginRequired
@@ -137,10 +140,12 @@
})
public ApiResponse<Member> binDingPhone(@RequestBody EditMemberRequest editMemberRequest) {
editMemberRequest.setId(getMemberId());
+ String phone =editMemberRequest.getPhone();
Member member = memberService.updMemberPhone(editMemberRequest);
//鍚屾瀵艰喘缁戝畾淇℃伅
- if(StringUtils.isNotBlank(editMemberRequest.getPhone())){
- customerUserService.syncByPhone(editMemberRequest.getPhone());
+ if(StringUtils.isNotBlank(phone)){
+ customerUserService.syncByPhone(member);
+ member = memberService.getMemberInfo(getMemberId());
}
return ApiResponse.success("鏇存柊鎴愬姛",member);
}
@@ -154,7 +159,9 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "鎵嬫満鍙蜂俊鎭�", required = true),
})
public ApiResponse syncCustomerUser(@RequestParam String phone) {
- customerUserService.syncByPhone(phone);
+ if(StringUtils.isNotBlank(getLoginMemberInfo().getPhone())){
+ customerUserService.syncByPhone(getLoginMemberInfo());
+ }
return ApiResponse.success("鍚屾鎴愬姛");
}
--
Gitblit v1.9.3