From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java
index df75ba5..19c6c9e 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java
@@ -47,6 +47,16 @@
return ApiResponse.success(memberService.wxLogin(code,recId));
}
+ @LoginRequired
+ @ApiOperation(value = "缁戝畾鎵嬫満鍙�", notes = "灏忕▼搴忕")
+ @PostMapping("/wxPhone")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<AccountResponse> wxPhone(@Valid @RequestBody WxPhoneRequest wxPhoneRequest) {
+ return ApiResponse.success(memberService.wxPhone(wxPhoneRequest));
+ }
+
@ApiOperation(value = "娴嬭瘯鐧婚檰鎺ュ彛", notes = "灏忕▼搴忕")
@GetMapping("/testLogin")
@ApiImplicitParams({
@@ -56,17 +66,6 @@
return ApiResponse.success(memberService.wxLoginTest(memberId));
}
- @LoginRequired
- @ApiOperation(value = "缁戝畾鎵嬫満鍙�", notes = "灏忕▼搴忕")
- @PostMapping("/wxPhone")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
- })
- public ApiResponse wxLogin(@Valid @RequestBody WxPhoneRequest wxPhoneRequest) {
- wxPhoneRequest.setMemberId(getMemberId());
- memberService.wxPhone(wxPhoneRequest);
- return ApiResponse.success("缁戝畾鎴愬姛");
- }
@LoginRequired
@ApiOperation(value = "鏇存柊鐢ㄦ埛淇℃伅", notes = "灏忕▼搴忕")
--
Gitblit v1.9.3