From 0a768ef6cb02e5af033d38f78856fa2ec641570e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 21 三月 2024 22:39:48 +0800
Subject: [PATCH] 优化用户注册流程
---
service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java | 64 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java
index 74ddfd7..4355d29 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java
@@ -13,10 +13,12 @@
import com.java110.dto.msg.SmsDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.system.SystemInfoDto;
import com.java110.dto.user.LoginOwnerResDto;
import com.java110.dto.user.UserAttrDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.common.ISmsInnerServiceSMO;
+import com.java110.intf.common.ISystemInfoV1InnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.user.*;
import com.java110.po.owner.OwnerAppUserPo;
@@ -27,10 +29,7 @@
import com.java110.utils.constant.UserLevelConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.exception.SMOException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.StringUtil;
-import com.java110.utils.util.ValidatorUtil;
+import com.java110.utils.util.*;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -71,6 +70,9 @@
@Autowired
private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+ @Autowired
+ private ISystemInfoV1InnerServiceSMO systemInfoV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
Assert.hasKeyAndValue(reqJson, "username", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛鍚�");
@@ -79,7 +81,7 @@
//todo 楠岃瘉鐮佺櫥褰�
if (reqJson.containsKey("loginByPhone") && reqJson.getBoolean("loginByPhone")) {
SmsDto smsDto = new SmsDto();
- smsDto.setTel(reqJson.getString("userName"));
+ smsDto.setTel(reqJson.getString("username"));
smsDto.setCode(reqJson.getString("password"));
smsDto = smsInnerServiceSMOImpl.validateCode(smsDto);
if (!smsDto.isSuccess()) {
@@ -94,10 +96,10 @@
UserDto userDto = new UserDto();
userDto.setLevelCd(UserDto.LEVEL_CD_USER);
- if (ValidatorUtil.isMobile(reqJson.getString("userName"))) {//鐢ㄦ埛涓存椂绉橀挜鐧诲綍
- userDto.setTel(reqJson.getString("userName"));
+ if (ValidatorUtil.isMobile(reqJson.getString("username"))) {//鐢ㄦ埛涓存椂绉橀挜鐧诲綍
+ userDto.setTel(reqJson.getString("username"));
} else {
- userDto.setUserName(reqJson.getString("userName"));
+ userDto.setUserName(reqJson.getString("username"));
}
// todo 涓嶆槸楠岃瘉鐮佺櫥褰�
@@ -109,37 +111,33 @@
List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
//todo 1.1 濡傛灉楠岃瘉鐮佺櫥褰曪紝鑷姩缁戝畾鍏崇郴
- if (userDtos == null || userDtos.size() < 1) {
+ if (ListUtil.isNull(userDtos)) {
userDtos = ifOwnerLoginByPhone(reqJson, context);
}
- if (userDtos == null || userDtos.size() < 1) {
- throw new CmdException("涓氫富涓嶅瓨鍦紝璇峰厛娉ㄥ唽");
+ if (ListUtil.isNull(userDtos)) {
+ throw new CmdException("鐢ㄦ埛涓嶅瓨鍦紝璇峰厛娉ㄥ唽");
}
// todo 2.0 鏍￠獙 涓氫富鐢ㄦ埛缁戝畾琛ㄦ槸鍚﹀瓨鍦ㄨ褰�
OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
ownerAppUserDto.setUserId(userDtos.get(0).getUserId());
ownerAppUserDto.setLink(userDtos.get(0).getTel());
+ ownerAppUserDto.setState(OwnerAppUserDto.STATE_AUDIT_SUCCESS);
List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
- if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {
- throw new CmdException("鐢ㄦ埛鏈敞鍐岋紝璇峰厛娉ㄥ唽");
+ String communityId = "";
+ if (!ListUtil.isNull(ownerAppUserDtos)) {
+ // todo 4.0 鏌ヨ灏忓尯鏄惁瀛樺湪
+ communityId = ownerAppUserDtos.get(0).getCommunityId();
+ }else{
+ SystemInfoDto systemInfoDto = new SystemInfoDto();
+ List<SystemInfoDto> systemInfoDtos = systemInfoV1InnerServiceSMOImpl.querySystemInfos(systemInfoDto);
+ communityId = systemInfoDtos.get(0).getDefaultCommunityId();
}
-
- // todo 3.0 鏌ヨ涓氫富鏄惁瀛樺湪
- OwnerDto ownerDto = new OwnerDto();
- ownerDto.setMemberId(ownerAppUserDtos.get(0).getMemberId());
- ownerDto.setCommunityId(ownerAppUserDtos.get(0).getCommunityId());
- List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
-
- Assert.listOnlyOne(ownerDtos, "涓氫富涓嶅瓨鍦�");
-
- // todo 4.0 鏌ヨ灏忓尯鏄惁瀛樺湪
CommunityDto communityDto = new CommunityDto();
- communityDto.setCommunityId(ownerAppUserDtos.get(0).getCommunityId());
+ communityDto.setCommunityId(communityId);
List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
- Assert.listOnlyOne(communityDtos, "灏忓尯涓嶅瓨鍦紝" + ownerAppUserDtos.get(0).getCommunityId());
-
+ Assert.listOnlyOne(communityDtos, "灏忓尯涓嶅瓨鍦紝纭繚寮�鍙戣�呰处鎴烽厤缃粯璁ゅ皬鍖�" + communityId);
//todo 鐢熸垚 app 姘镐箙鐧诲綍key
UserDto tmpUserDto = userDtos.get(0);
@@ -147,16 +145,14 @@
//todo 鐢熸垚鐧诲綍token
String token = generatorLoginToken(tmpUserDto);
-
LoginOwnerResDto loginOwnerResDto = new LoginOwnerResDto();
- loginOwnerResDto.setOwnerId(ownerDtos.get(0).getOwnerId());
- loginOwnerResDto.setMemberId(ownerDtos.get(0).getMemberId());
- loginOwnerResDto.setOwnerName(ownerDtos.get(0).getName());
+
+ loginOwnerResDto.setCommunityId(communityDtos.get(0).getCommunityId());
+ loginOwnerResDto.setCommunityName(communityDtos.get(0).getName());
+ loginOwnerResDto.setCommunityTel(communityDtos.get(0).getTel());
loginOwnerResDto.setUserId(tmpUserDto.getUserId());
loginOwnerResDto.setUserName(tmpUserDto.getName());
- loginOwnerResDto.setOwnerTel(ownerDtos.get(0).getLink());
- loginOwnerResDto.setCommunityId(ownerDtos.get(0).getCommunityId());
- loginOwnerResDto.setCommunityName(communityDtos.get(0).getName());
+ loginOwnerResDto.setOwnerTel(tmpUserDto.getTel());
loginOwnerResDto.setToken(token);
loginOwnerResDto.setKey(newKey);
context.setResponseEntity(ResultVo.createResponseEntity(loginOwnerResDto));
@@ -235,7 +231,7 @@
List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
// 璇存槑涓氫富涓嶅瓨鍦� 鐩存帴杩斿洖璺戝紓甯�
- if (ownerDtos == null || ownerDtos.size() < 1) {
+ if (ListUtil.isNull(ownerDtos)) {
return null;
}
--
Gitblit v1.8.0