From eb0d880929fccd4998d6b9836077961d1f975fea Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期一, 18 八月 2025 16:15:25 +0800
Subject: [PATCH] 暂存0815
---
service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java | 60 +++++++++++++++++++++++++++++++++---------------------------
1 files changed, 33 insertions(+), 27 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 2f9259e..e116cba 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
@@ -38,6 +38,7 @@
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import java.text.ParseException;
import java.util.HashMap;
@@ -147,11 +148,13 @@
ownerAppUserDto.setLink(userDtos.get(0).getTel());
ownerAppUserDto.setState(OwnerAppUserDto.STATE_AUDIT_SUCCESS);
List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
-
+ LoginOwnerResDto loginOwnerResDto = new LoginOwnerResDto();
+ loginOwnerResDto.setAuditState(userDtos.get(0).getAuditState());
String communityId = "";
if (!ListUtil.isNull(ownerAppUserDtos)) {
// todo 4.0 鏌ヨ灏忓尯鏄惁瀛樺湪
communityId = ownerAppUserDtos.get(0).getCommunityId();
+ loginOwnerResDto.setAuditState(ownerAppUserDtos.get(0).getState());
} else {
SystemInfoDto systemInfoDto = new SystemInfoDto();
List<SystemInfoDto> systemInfoDtos = systemInfoV1InnerServiceSMOImpl.querySystemInfos(systemInfoDto);
@@ -168,7 +171,7 @@
//todo 鐢熸垚鐧诲綍token
String token = generatorLoginToken(tmpUserDto);
- LoginOwnerResDto loginOwnerResDto = new LoginOwnerResDto();
+
loginOwnerResDto.setCommunityId(communityDtos.get(0).getCommunityId());
loginOwnerResDto.setCommunityName(communityDtos.get(0).getName());
@@ -278,34 +281,37 @@
if (flag < 1) {
throw new CmdException("娉ㄥ唽澶辫触");
}
-
- OwnerAppUserPo ownerAppUserPo = new OwnerAppUserPo();
- //鐘舵�佺被鍨嬶紝10000 瀹℃牳涓紝 11000 寰呰璇� ,12000 瀹℃牳鎴愬姛锛�13000 瀹℃牳澶辫触
- ownerAppUserPo.setState(OwnerAppUserDto.STATE_NOT_AUDIT);
- ownerAppUserPo.setAppTypeCd("10010");
- ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appUserId));
- ownerAppUserPo.setMemberId(ownerDtos.get(0).getMemberId());
- ownerAppUserPo.setCommunityName(tmpCommunityDto.getName());
- ownerAppUserPo.setCommunityId(ownerDtos.get(0).getCommunityId());
- ownerAppUserPo.setAppUserName(ownerDtos.get(0).getName());
- ownerAppUserPo.setIdCard(ownerDtos.get(0).getIdCard());
- ownerAppUserPo.setAppType("WECHAT");
- ownerAppUserPo.setLink(ownerDtos.get(0).getLink());
- ownerAppUserPo.setUserId(userPo.getUserId());
- ownerAppUserPo.setOpenId("-1");
- ownerAppUserPo.setOwnerTypeCd(ownerDtos.get(0).getOwnerTypeCd());
-
- queryOwnerRoom(ownerDtos.get(0), ownerAppUserPo);
-
-
- flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
- if (flag < 1) {
- throw new CmdException("娣诲姞鐢ㄦ埛涓氫富鍏崇郴澶辫触");
- }
-
UserDto userDto = new UserDto();
userDto.setUserId(userPo.getUserId());
List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
+ //鐢╱serId鍜屾墜鏈哄彿鏌ヨ缁戝畾鍏崇郴锛屾病鏈夊垯鏂板
+ OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+ ownerAppUserDto.setLink(userPo.getTel());
+ ownerAppUserDto.setUserId(userPo.getUserId());
+ List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+ if(CollectionUtils.isEmpty(ownerAppUserDtos)){
+ OwnerAppUserPo ownerAppUserPo = new OwnerAppUserPo();
+ //鐘舵�佺被鍨嬶紝10000 瀹℃牳涓紝 11000 寰呰璇� ,12000 瀹℃牳鎴愬姛锛�13000 瀹℃牳澶辫触
+ ownerAppUserPo.setState(OwnerAppUserDto.STATE_NOT_AUDIT);
+ ownerAppUserPo.setAppTypeCd("10010");
+ ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appUserId));
+ ownerAppUserPo.setMemberId(ownerDtos.get(0).getMemberId());
+ ownerAppUserPo.setCommunityName(tmpCommunityDto.getName());
+ ownerAppUserPo.setCommunityId(ownerDtos.get(0).getCommunityId());
+ ownerAppUserPo.setAppUserName(ownerDtos.get(0).getName());
+ ownerAppUserPo.setIdCard(ownerDtos.get(0).getIdCard());
+ ownerAppUserPo.setAppType("WECHAT");
+ ownerAppUserPo.setLink(ownerDtos.get(0).getLink());
+ ownerAppUserPo.setUserId(userPo.getUserId());
+ ownerAppUserPo.setOpenId("-1");
+ ownerAppUserPo.setOwnerTypeCd(ownerDtos.get(0).getOwnerTypeCd());
+ queryOwnerRoom(ownerDtos.get(0), ownerAppUserPo);
+ flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
+ if (flag < 1) {
+ throw new CmdException("娣诲姞鐢ㄦ埛涓氫富鍏崇郴澶辫触");
+ }
+ userDtos.get(0).setAuditState(ownerAppUserPo.getState());
+ }
return userDtos;
}
--
Gitblit v1.8.0