From ac2230cf612417b2dcbdcc23814e19f4955941b2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 16 七月 2024 16:26:36 +0800
Subject: [PATCH] 代码提交

---
 server/web/src/main/java/com/doumee/api/web/CustomerApi.java |   66 +++++++++++++++++++++++++++++++--
 1 files changed, 62 insertions(+), 4 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 0e9ba35..0b00507 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
@@ -19,6 +19,7 @@
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +59,9 @@
     @Autowired
     private UsersService usersService;
 
+    @Autowired
+    private CustomerUserService customerUserService;
+
     @ApiOperation(value = "瀹㈡埛绔皬绋嬪簭鐧婚檰", notes = "瀹㈡埛绔皬绋嬪簭")
     @GetMapping("/wxLoginCustomer")
     @ApiImplicitParams({
@@ -83,10 +87,41 @@
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
     })
-    public ApiResponse updMemberDetail(@RequestBody EditMemberRequest editMemberRequest) {
-        editMemberRequest.setMemberId(getMemberId());
-        memberService.updMemberDetail(editMemberRequest);
-        return  ApiResponse.success("鏇存柊鎴愬姛");
+    public ApiResponse<Member> editMember(@RequestBody EditMemberRequest editMemberRequest) {
+        editMemberRequest.setId(getMemberId());
+        //鍚屾瀵艰喘缁戝畾淇℃伅
+        if(StringUtils.isNotBlank(editMemberRequest.getPhone())){
+            customerUserService.syncByPhone(editMemberRequest.getPhone());
+        }
+        return  ApiResponse.success("鏇存柊鎴愬姛",memberService.updMemberDetail(editMemberRequest));
+    }
+
+    @LoginRequired
+    @ApiOperation(value = "缁戝畾鎵嬫満鍙蜂俊鎭�", notes = "瀹㈡埛绔皬绋嬪簭")
+    @PostMapping("/binDingPhone")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+    })
+    public ApiResponse<Member> binDingPhone(@RequestBody EditMemberRequest editMemberRequest) {
+        editMemberRequest.setId(getMemberId());
+        //鍚屾瀵艰喘缁戝畾淇℃伅
+        if(StringUtils.isNotBlank(editMemberRequest.getPhone())){
+            customerUserService.syncByPhone(editMemberRequest.getPhone());
+        }
+        return  ApiResponse.success("鏇存柊鎴愬姛",memberService.updMemberPhone(editMemberRequest));
+    }
+
+
+    @LoginRequired
+    @ApiOperation(value = "鍚屾瀵艰喘缁戝畾淇℃伅", notes = "瀹㈡埛绔皬绋嬪簭")
+    @GetMapping("/syncCustomerUser")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "鎵嬫満鍙蜂俊鎭�", required = true),
+    })
+    public ApiResponse syncCustomerUser(@RequestParam String phone) {
+        customerUserService.syncByPhone(phone);
+        return  ApiResponse.success("鍚屾鎴愬姛");
     }
 
     @LoginRequired
@@ -178,6 +213,17 @@
     }
 
     @LoginRequired
+    @ApiOperation("鎴戠殑瀵艰喘鍒楄〃")
+    @PostMapping("/myUserPage")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+    })
+    public ApiResponse<PageData<Users>> myUserPage (@RequestBody PageWrap<Users> pageWrap) {
+        return ApiResponse.success(usersService.findPage(pageWrap));
+    }
+
+
+    @LoginRequired
     @ApiOperation(value = "瀵艰喘璇︽儏", notes = "瀹㈡埛绔皬绋嬪簭")
     @GetMapping("/usersDetail")
     @ApiImplicitParams({
@@ -189,6 +235,18 @@
     }
 
 
+    @LoginRequired
+    @ApiOperation(value = "娴嬭瘯灏忕▼搴廡oken", notes = "瀹㈡埛绔皬绋嬪簭")
+    @GetMapping("/testToken")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+    })
+    public ApiResponse testToken () {
+        memberService.updWxMiniToken();
+        return ApiResponse.success("鏇存柊鎴愬姛");
+    }
+
+
 
 
 }

--
Gitblit v1.9.3