From c6b21925af97c059c128763b52750444df9fdaa9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 05 八月 2024 18:31:49 +0800
Subject: [PATCH] 代码提交

---
 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