From 5e35a8c82dba190fb91ab275115d54e379a136e8 Mon Sep 17 00:00:00 2001 From: jsowell <123@jsowell.com> Date: Thu, 14 May 2026 08:58:16 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=85=AC=E5=85=B1=E7=99=BB=E9=99=86?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=96=B9=E6=B3=95=E4=BD=BF=E7=94=A8V2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/AgentDevService.java | 2 +- .../java/com/jsowell/service/MemberService.java | 16 +++++++++++++--- .../MemberServiceRegisterAndLoginTest.java | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java b/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java index 8332b6b65..f548df5ff 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java @@ -646,7 +646,7 @@ public class AgentDevService { .mobileNumber(phoneNumber) .requestSource(dto.getRequestSource()) .build(); - return memberService.memberRegisterAndLogin(loginDTO); // 其他一级运营商，微信一键登录 + return memberService.memberRegisterAndLoginV2(loginDTO); // 其他一级运营商，微信一键登录 } /** diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 0f7fa3453..e133014bf 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -159,13 +159,23 @@ public class MemberService { public String memberRegisterAndLoginBySMS(MemberRegisterAndLoginDTO dto) { // 校验短信验证码 两种情况不能通过校验，1-验证码错误；2-超时 验证码10分钟有效 checkVerificationCode(dto); - return memberRegisterAndLogin(dto); // 短信验证码登录 + return memberRegisterAndLoginV2(dto); // 短信验证码登录 } /** * 公共登录注册方法 + * + *

该方法已废弃，当前会员注册/登录主流程统一走 + * {@link #memberRegisterAndLoginV2(MemberRegisterAndLoginDTO)}。

+ * + *

保留该方法的原因：

+ *

1. 便于和 V2 做逻辑对照，确认重构前后行为一致。

+ *

2. 作为短期回溯参考，降低生产切换风险。

+ *

3. 避免在一次重构中直接删除旧实现，影响排查问题时的可读性。

+ * * @return token返给前端 */ + @Deprecated protected String memberRegisterAndLogin(MemberRegisterAndLoginDTO dto) { String phoneNumber = dto.getMobileNumber(); String firstLevelMerchantId = dto.getFirstLevelMerchantId(); @@ -566,7 +576,7 @@ public class MemberService { .mobileNumber(mobileNumber) .requestSource(dto.getRequestSource()) .build(); - return memberRegisterAndLogin(loginDTO); // 微信小程序一键登录 + return memberRegisterAndLoginV2(loginDTO); // 微信小程序一键登录 } /** @@ -616,7 +626,7 @@ public class MemberService { .mobileNumber(dto.getMobileNumber()) .buyerId(dto.getUserId()) .build(); - return memberRegisterAndLogin(loginDTO); // 支付宝小程序一键登录 + return memberRegisterAndLoginV2(loginDTO); // 支付宝小程序一键登录 } /** diff --git a/jsowell-admin/src/test/java/com/jsowell/service/MemberServiceRegisterAndLoginTest.java b/jsowell-admin/src/test/java/com/jsowell/service/MemberServiceRegisterAndLoginTest.java index ca297aaae..ba4a2f916 100644 --- a/jsowell-admin/src/test/java/com/jsowell/service/MemberServiceRegisterAndLoginTest.java +++ b/jsowell-admin/src/test/java/com/jsowell/service/MemberServiceRegisterAndLoginTest.java @@ -123,7 +123,7 @@ class MemberServiceRegisterAndLoginTest { BusinessException exception = assertThrows(BusinessException.class, () -> service.memberRegisterAndLoginV2(dto)); - assertEquals(ReturnCodeEnum.CODE_MEMBER_REGISTER_AND_LOGIN_PROCESSING.getCode(), exception.getCode()); + assertEquals(ReturnCodeEnum.CODE_MEMBER_REGISTER_AND_LOGIN_PROCESSING.getValue(), exception.getCode()); verify(memberBasicInfoService, never()).selectInfoByMobileNumber(anyString(), anyString()); verify(redisCache, never()).unLock(CacheConstants.USER_APP_REGISTER + "13800138002:88"); verify(transactionService, never()).createMember(any(MemberTransactionDTO.class)); @@ -230,7 +230,7 @@ class MemberServiceRegisterAndLoginTest { BusinessException exception = assertThrows(BusinessException.class, () -> invoker.invoke(service, dto)); - assertEquals(ReturnCodeEnum.CODE_MEMBER_REGISTER_AND_LOGIN_PROCESSING.getCode(), exception.getCode()); + assertEquals(ReturnCodeEnum.CODE_MEMBER_REGISTER_AND_LOGIN_PROCESSING.getValue(), exception.getCode()); verify(memberBasicInfoService, never()).selectInfoByMobileNumber(anyString(), anyString()); verify(transactionService, never()).createMember(any(MemberTransactionDTO.class)); }