autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-16 07:48:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 公共登陆注册方法使用V2

Browse Source
This commit is contained in:
jsowell
2026-05-14 08:58:16 +08:00
parent 0c68b7e033
commit 5e35a8c82d
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/service/AgentDevService.java
View File

@@ -646,7 +646,7 @@ public class AgentDevService {
.mobileNumber(phoneNumber)
.requestSource(dto.getRequestSource())
.build();
return memberService.memberRegisterAndLogin(loginDTO); // 其他一级运营商，微信一键登录
return memberService.memberRegisterAndLoginV2(loginDTO); // 其他一级运营商，微信一键登录
}
/**

16
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -159,13 +159,23 @@ public class MemberService {
public String memberRegisterAndLoginBySMS(MemberRegisterAndLoginDTO dto) {
// 校验短信验证码 两种情况不能通过校验，1-验证码错误；2-超时 验证码10分钟有效
checkVerificationCode(dto);
return memberRegisterAndLogin(dto); // 短信验证码登录
return memberRegisterAndLoginV2(dto); // 短信验证码登录
}
/**
* 公共登录注册方法
*
* <p>该方法已废弃，当前会员注册/登录主流程统一走
* {@link #memberRegisterAndLoginV2(MemberRegisterAndLoginDTO)}。</p>
*
* <p>保留该方法的原因：</p>
* <p>1. 便于和 V2 做逻辑对照，确认重构前后行为一致。</p>
* <p>2. 作为短期回溯参考，降低生产切换风险。</p>
* <p>3. 避免在一次重构中直接删除旧实现，影响排查问题时的可读性。</p>
*
* @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); // 支付宝小程序一键登录
}
/**

4
jsowell-admin/src/test/java/com/jsowell/service/MemberServiceRegisterAndLoginTest.java
View File

@@ -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));
}