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 a8cd040..ce8d4c5 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java @@ -199,6 +199,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)); } @@ -255,7 +256,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) { @@ -267,6 +268,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)); } } @@ -328,6 +330,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)); } @@ -401,6 +404,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)); @@ -413,6 +417,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)); } } @@ -420,6 +425,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")