From 2982818a0c77ab9380d7e0c40259198914797152 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Sat, 20 Jun 2026 22:03:07 +0800
Subject: [PATCH] =?UTF-8?q?10198=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8B=E7=BA=A7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/WxLoginController.java  | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java
index 183888b..5d816ac 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java
@@ -196,6 +196,7 @@ public class WxLoginController extends BaseController {
             String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
                     configProperties.getTokenExpireTime(), configProperties.getTokenKey());
             loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, user.getTenantId(), request);
+            if (getTenantId() != null && getTenantId().equals(10198)) activateShopUserMemberByPhone(phone);
 
             return success("登录成功", new LoginResult(access_token, user));
         }
@@ -252,7 +253,7 @@ public class WxLoginController extends BaseController {
             String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
                     configProperties.getTokenExpireTime(), configProperties.getTokenKey());
             loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_REGISTER, null, user.getTenantId(), request);
-
+            if (getTenantId() != null && getTenantId().equals(10198)) activateShopUserMemberByPhone(phone);
             return success("注册并登录成功", new LoginResult(access_token, user));
 
         } catch (BusinessException e) {
@@ -264,6 +265,7 @@ public class WxLoginController extends BaseController {
                     String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
                             configProperties.getTokenExpireTime(), configProperties.getTokenKey());
                     loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, user.getTenantId(), request);
+                    activateShopUserMemberByPhone(phone);
                     return success("登录成功", new LoginResult(access_token, user));
                 }
             }
@@ -325,6 +327,7 @@ public class WxLoginController extends BaseController {
             String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
                     configProperties.getTokenExpireTime(), configProperties.getTokenKey());
             loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, user.getTenantId(), request);
+            activateShopUserMemberByPhone(phone);
 
             return success("登录成功", new LoginResult(access_token, user));
         }
@@ -398,6 +401,7 @@ public class WxLoginController extends BaseController {
             String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
                     configProperties.getTokenExpireTime(), configProperties.getTokenKey());
             loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_REGISTER, null, user.getTenantId(), request);
+            activateShopUserMemberByPhone(phone);
 
             return success("注册并登录成功", new LoginResult(access_token, user));
 
@@ -410,6 +414,7 @@ public class WxLoginController extends BaseController {
                     String access_token = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
                             configProperties.getTokenExpireTime(), configProperties.getTokenKey());
                     loginRecordService.saveAsync(user.getUsername(), LoginRecord.TYPE_LOGIN, null, user.getTenantId(), request);
+                    activateShopUserMemberByPhone(phone);
                     return success("登录成功", new LoginResult(access_token, user));
                 }
             }
@@ -417,6 +422,26 @@ public class WxLoginController extends BaseController {
         }
     }
 
+    private void activateShopUserMemberByPhone(String phone) {
+        if (StrUtil.isBlank(phone)) {
+            return;
+        }
+        try {
+            String apiUrl = "https://paopao-api.websoft.top/api/shop/shop-user-member/activate-by-phone";
+            String normalizedPhone = phone.trim();
+            JSONObject body = new JSONObject();
+            body.put("phone", normalizedPhone);
+            String response = HttpRequest.post(apiUrl)
+                    .header("Content-Type", "application/json")
+                    .body(body.toJSONString())
+                    .execute()
+                    .body();
+            System.out.println("激活会员记录响应: " + response);
+        } catch (Exception e) {
+            System.err.println("激活会员记录失败，但不影响登录流程: " + e.getMessage());
+        }
+    }
+
     @Operation(summary = "微信授权手机号码并更新")
     @Transactional(rollbackFor = {Exception.class})
     @PostMapping("/updatePhoneByMpWx")