优化用户注册流程

service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomHistoryFeeDetailDataCleaningAdapt.java

@@ -83,7 +83,6 @@ public class ImportRoomHistoryFeeDetailDataCleaningAdapt extends DefaultImportDa
             importRoomFee.setStoreId(paramIn.getString("storeId"));
             importRoomFee.setObjType(paramIn.getString("objType"));
             importRoomFee.setCommunityId(paramIn.getString("communityId"));
-
         }
         return rooms;
     }

service-user/src/main/java/com/java110/user/cmd/owner/OwnerRegisterCmd.java

@@ -14,6 +14,8 @@ import com.java110.dto.community.CommunityDto;
 import com.java110.dto.msg.SmsDto;
 import com.java110.dto.owner.OwnerAppUserDto;
 import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.user.UserAttrDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.common.ISmsInnerServiceSMO;
 import com.java110.intf.community.ICommunityInnerServiceSMO;
 import com.java110.intf.store.IStoreInnerServiceSMO;
@@ -27,6 +29,7 @@ import com.java110.utils.constant.UserLevelConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
@@ -72,12 +75,21 @@ public class OwnerRegisterCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "msgCode", "未包含联系电话验证码");
         Assert.hasKeyAndValue(reqJson, "password", "未包含密码");
 
+        UserDto userDto = new UserDto();
+        userDto.setTel(reqJson.getString("link"));
+        userDto.setLevelCd(UserDto.LEVEL_CD_USER);
+        List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
+
+        if (!ListUtil.isNull(userDtos)) {
+            throw new CmdException("手机号已存在，请登陆");
+        }
+
         SmsDto smsDto = new SmsDto();
         smsDto.setTel(reqJson.getString("link"));
         smsDto.setCode(reqJson.getString("msgCode"));
         smsDto = smsInnerServiceSMOImpl.validateCode(smsDto);
 
-        if (!smsDto.isSuccess() && "ON".equals(MappingCache.getValue(MappingConstant.SMS_DOMAIN,SendSmsFactory.SMS_SEND_SWITCH))) {
+        if (!smsDto.isSuccess() && "ON".equals(MappingCache.getValue(MappingConstant.SMS_DOMAIN, SendSmsFactory.SMS_SEND_SWITCH))) {
             throw new IllegalArgumentException(smsDto.getMsg());
         }
     }
@@ -86,38 +98,90 @@ public class OwnerRegisterCmd extends Cmd {
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-        OwnerAppUserDto ownerAppUserDto = BeanConvertUtil.covertBean(reqJson, OwnerAppUserDto.class);
-        ownerAppUserDto.setStates(new String[]{"10000", "12000"});
-
-        //是否已经注册过
-        List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
-
-        if (ownerAppUserDtos != null && ownerAppUserDtos.size() > 0) {
-            throw new IllegalArgumentException("已经注册过用户");
-        }
 
         OwnerDto ownerDto = new OwnerDto();
         ownerDto.setLink(reqJson.getString("link"));
-
         List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
 
+        //设置默认密码
+        String userPassword = reqJson.getString("password");
+        userPassword = AuthenticationFactory.passwdMd5(userPassword);
+        String name = reqJson.getString("link");
+        if (!ListUtil.isNull(ownerDtos)) {
+            name = ownerDtos.get(0).getName();
+        }
+        //todo 注册用户
+        UserPo userPo = new UserPo();
+        userPo.setAddress("无");
+        userPo.setUserId(GenerateCodeFactory.getUserId());
+        userPo.setLevelCd(UserLevelConstant.USER_LEVEL_ORDINARY);
+        userPo.setName(name);
+        userPo.setTel(reqJson.getString("link"));
+        userPo.setPassword(userPassword);
+
+        int flag = userV1InnerServiceSMOImpl.saveUser(userPo);
+        if (flag < 1) {
+            throw new CmdException("注册失败");
+        }
+        //todo 保存openId
+        String openId = reqJson.getString("openId");
+        if (!StringUtil.isEmpty(openId)) {
+            UserAttrPo userAttrPo = new UserAttrPo();
+            userAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+            userAttrPo.setSpecCd(UserAttrDto.SPEC_OPEN_ID);
+            userAttrPo.setUserId(userPo.getUserId());
+            userAttrPo.setValue(openId);
+            flag = userAttrV1InnerServiceSMOImpl.saveUserAttr(userAttrPo);
+            if (flag < 1) {
+                throw new CmdException("注册失败");
+            }
+        }
+
+        //todo 根据手机号未关联到业主直接返回成功，后续通过认证房屋的方式操作
+        if (ListUtil.isNull(ownerDtos)) {
+            return;
+        }
         String appId = cmdDataFlowContext.getReqHeaders().get("app-id");
+        String appType = "";
         if (AppDto.WECHAT_OWNER_APP_ID.equals(appId)) { //公众号
-            reqJson.put("appType", OwnerAppUserDto.APP_TYPE_WECHAT);
+            appType = OwnerAppUserDto.APP_TYPE_WECHAT;
         } else if (AppDto.WECHAT_MINA_OWNER_APP_ID.equals(appId)) { //小程序
-            reqJson.put("appType", OwnerAppUserDto.APP_TYPE_WECHAT_MINA);
+            appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
         } else {//app
-            reqJson.put("appType", OwnerAppUserDto.APP_TYPE_APP);
+            appType = OwnerAppUserDto.APP_TYPE_APP;
         }
-        reqJson.put("userId", GenerateCodeFactory.getUserId());
-        if (reqJson.containsKey("openId")) {
-            reqJson.put("openId", reqJson.getString("openId"));
-        } else {
-            reqJson.put("openId", "-1");
+
+        OwnerAppUserPo ownerAppUserPo = null;
+
+        List<CommunityDto> communityDtos = null;
+        for (OwnerDto tmpOwnerDto : ownerDtos) {
+            CommunityDto communityDto = new CommunityDto();
+            communityDto.setState("1100");
+            communityDto.setCommunityId(ownerDto.getCommunityId());
+            communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+            if (communityDtos == null || communityDtos.size() < 1) {
+                continue;
+            }
+            communityDto = communityDtos.get(0);
+            ownerAppUserPo = new OwnerAppUserPo();
+            ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appUserId));
+            ownerAppUserPo.setMemberId(tmpOwnerDto.getMemberId());
+            ownerAppUserPo.setCommunityId(communityDto.getCommunityId());
+            ownerAppUserPo.setCommunityName(communityDto.getName());
+            ownerAppUserPo.setAppUserName(tmpOwnerDto.getName());
+            ownerAppUserPo.setIdCard(tmpOwnerDto.getIdCard());
+            ownerAppUserPo.setLink(tmpOwnerDto.getLink());
+            ownerAppUserPo.setOpenId("-1");
+            ownerAppUserPo.setAppTypeCd("10010");
+            ownerAppUserPo.setState(OwnerAppUserDto.STATE_AUDIT_SUCCESS);
+            ownerAppUserPo.setRemark("注册自动关联");
+            ownerAppUserPo.setUserId(userPo.getUserId());
+            ownerAppUserPo.setAppType(appType);
+            flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
+            if (flag < 1) {
+                throw new CmdException("添加用户业主关系失败");
+            }
         }
-        //添加小区楼
-        addOwnerAppUser(reqJson, ownerDtos);
-        registerUser(reqJson, ownerDtos);
 
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
@@ -155,32 +219,7 @@ public class OwnerRegisterCmd extends Cmd {
             return;
         }
 
-        OwnerAppUserPo ownerAppUserPo = null;
-        for (OwnerDto ownerDto : ownerDtos) {
-            CommunityDto communityDto = new CommunityDto();
-            communityDto.setState("1100");
-            communityDto.setCommunityId(ownerDto.getCommunityId());
-            communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
-            if (communityDtos == null || communityDtos.size() < 1) {
-                continue;
-            }
-            tmpCommunityDto = communityDtos.get(0);
-            ownerAppUserPo = BeanConvertUtil.covertBean(paramInJson, OwnerAppUserPo.class);
-            //状态类型，10000 审核中，12000 审核成功，13000 审核失败
-            ownerAppUserPo.setState("12000");
-            ownerAppUserPo.setAppTypeCd("10010");
-            ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appUserId));
-            ownerAppUserPo.setMemberId(ownerDto.getMemberId());
-            ownerAppUserPo.setCommunityName(tmpCommunityDto.getName());
-            ownerAppUserPo.setCommunityId(tmpCommunityDto.getCommunityId());
-            ownerAppUserPo.setAppUserName(ownerDto.getName());
-            ownerAppUserPo.setIdCard(ownerDto.getIdCard());
 
-            int flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
-            if (flag < 1) {
-                throw new CmdException("添加用户业主关系失败");
-            }
-        }
     }
 
     /**
@@ -188,44 +227,5 @@ public class OwnerRegisterCmd extends Cmd {
      *
      * @param paramObj
      */
-    public void registerUser(JSONObject paramObj, List<OwnerDto> ownerDtos) {
-
-        if (paramObj.containsKey("email") && !StringUtil.isEmpty(paramObj.getString("email"))) {
-            Assert.isEmail(paramObj, "email", "不是有效的邮箱格式");
-        }
 
-        paramObj.put("levelCd", UserLevelConstant.USER_LEVEL_ORDINARY);
-        //设置默认密码
-        String userPassword = paramObj.getString("password");
-        userPassword = AuthenticationFactory.passwdMd5(userPassword);
-        paramObj.put("password", userPassword);
-
-        String tel = paramObj.getString("link");
-        String name = tel;
-        if (ownerDtos != null && ownerDtos.size() > 0) {
-            name = ownerDtos.get(0).getName();
-        }
-        UserPo userPo = BeanConvertUtil.covertBean(paramObj, UserPo.class);
-        userPo.setName(name);
-        userPo.setTel(tel);
-        int flag = userV1InnerServiceSMOImpl.saveUser(userPo);
-        if (flag < 1) {
-            throw new CmdException("注册失败");
-        }
-
-        if (!paramObj.containsKey("openId") || "-1".equals(paramObj.getString("openId"))) {
-            return;
-        }
-        JSONObject userAttrObj = new JSONObject();
-        userAttrObj.put("attrId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
-        userAttrObj.put("specCd", "100201911001");
-        userAttrObj.put("value", paramObj.getString("openId"));
-        UserAttrPo userAttrPo = BeanConvertUtil.covertBean(userAttrObj, UserAttrPo.class);
-        userAttrPo.setUserId(userPo.getUserId());
-        flag = userAttrV1InnerServiceSMOImpl.saveUserAttr(userAttrPo);
-        if (flag < 1) {
-            throw new CmdException("注册失败");
-        }
-
-    }
 }

service-user/src/main/java/com/java110/user/cmd/owner/RefreshAppUserBindingOwnerOpenIdCmd.java

@@ -2,6 +2,7 @@ package com.java110.user.cmd.owner;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -15,6 +16,8 @@ import com.java110.po.user.UserAttrPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
@@ -30,54 +33,37 @@ public class RefreshAppUserBindingOwnerOpenIdCmd extends Cmd {
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "appUserId", "绑定ID不能为空");
         Assert.hasKeyAndValue(reqJson, "openId", "必填，请填写状态");
         Assert.hasKeyAndValue(reqJson, "communityId", "必填，请填写小区ID");
-        if (reqJson.getString("appUserId").startsWith("-")) {
-            Assert.hasKeyAndValue(reqJson, "oldAppUserId", "必填，请填写老绑定ID");
-            Assert.hasKeyAndValue(reqJson, "appType", "必填，请填写appType");
-        }
     }
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-        String appUserId = reqJson.getString("appUserId");
-
-        if (appUserId.startsWith("-")) {
-            OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
-            ownerAppUserDto.setAppUserId(reqJson.getString("oldAppUserId"));
-            ownerAppUserDto.setCommunityId(reqJson.getString("communityId"));
-            List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
-
-            Assert.listOnlyOne(ownerAppUserDtos, "传入oldAppUserId错误");
-            OwnerAppUserPo ownerAppUserPo = BeanConvertUtil.covertBean(ownerAppUserDtos.get(0), OwnerAppUserPo.class);
-            ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_userId));
-            ownerAppUserPo.setAppType(reqJson.getString("appType"));
-            ownerAppUserPo.setOpenId(reqJson.getString("openId"));
-            ownerAppUserPo.setNickName(reqJson.getString("nickName"));
-            ownerAppUserPo.setHeadImgUrl(reqJson.getString("headImgUrl"));
-            ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
-            freshUserToken(reqJson, ownerAppUserDtos.get(0).getUserId());
-            return;
+
+        String userId = CmdContextUtils.getUserId(cmdDataFlowContext);
+
+        if (StringUtil.isEmpty(userId)) {
+            throw new CmdException("用户未登录");
         }
 
+        //todo 刷user_attr 中的openId
+        freshUserToken(reqJson, userId);
+
+        OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+        ownerAppUserDto.setUserId(userId);
+        ownerAppUserDto.setCommunityId(reqJson.getString("communityId"));
+        List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+
+        if (ListUtil.isNull(ownerAppUserDtos)) {
+            return;
+        }
         OwnerAppUserPo ownerAppUserPo = new OwnerAppUserPo();
-        ownerAppUserPo.setAppUserId(appUserId);
+        ownerAppUserPo.setAppUserId(ownerAppUserDtos.get(0).getAppUserId());
         ownerAppUserPo.setCommunityId(reqJson.getString("communityId"));
         ownerAppUserPo.setOpenId(reqJson.getString("openId"));
         ownerAppUserPo.setNickName(reqJson.getString("nickName"));
         ownerAppUserPo.setHeadImgUrl(reqJson.getString("headImgUrl"));
         ownerAppUserV1InnerServiceSMOImpl.updateOwnerAppUser(ownerAppUserPo);
-
-        OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
-        ownerAppUserDto.setAppUserId(appUserId);
-        ownerAppUserDto.setCommunityId(reqJson.getString("communityId"));
-        List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
-
-        Assert.listOnlyOne(ownerAppUserDtos, "传入appUserId错误");
-
-
-        freshUserToken(reqJson, ownerAppUserDtos.get(0).getUserId());
     }
 
     private void freshUserToken(JSONObject reqJson, String userId) {
@@ -91,7 +77,7 @@ public class RefreshAppUserBindingOwnerOpenIdCmd extends Cmd {
         userAttrDto.setUserId(userId);
         userAttrDto.setSpecCd(UserAttrDto.SPEC_OPEN_ID);
         List<UserAttrDto> userAttrDtos = userAttrV1InnerServiceSMOImpl.queryUserAttrs(userAttrDto);
-        if (userAttrDtos == null || userAttrDtos.size() < 1) {
+        if (ListUtil.isNull(userAttrDtos)) {
             UserAttrPo userAttrPo = new UserAttrPo();
             userAttrPo.setUserId(userId);
             userAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
@@ -115,7 +101,7 @@ public class RefreshAppUserBindingOwnerOpenIdCmd extends Cmd {
         userAttrDto.setUserId(userId);
         userAttrDto.setSpecCd(UserAttrDto.SPEC_UNION_ID);
         userAttrDtos = userAttrV1InnerServiceSMOImpl.queryUserAttrs(userAttrDto);
-        if (userAttrDtos == null || userAttrDtos.size() < 1) {
+        if (ListUtil.isNull(userAttrDtos)) {
             userAttrPo = new UserAttrPo();
             userAttrPo.setUserId(userId);
             userAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
@@ -130,7 +116,5 @@ public class RefreshAppUserBindingOwnerOpenIdCmd extends Cmd {
         userAttrPo.setSpecCd(UserAttrDto.SPEC_UNION_ID);
         userAttrPo.setValue(reqJson.getString("unionId"));
         userAttrV1InnerServiceSMOImpl.updateUserAttr(userAttrPo);
-
-
     }
 }

service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java

@@ -13,10 +13,12 @@ import com.java110.dto.community.CommunityDto;
 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.ResponseConstant;
 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 @@ public class OwnerUserLoginCmd extends Cmd {
     @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", "请求报文中未包含用户名");
@@ -109,10 +111,10 @@ public class OwnerUserLoginCmd extends Cmd {
         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) {
+        if (ListUtil.isNull(userDtos)) {
             throw new CmdException("用户不存在，请先注册");
         }
 
@@ -120,38 +122,22 @@ public class OwnerUserLoginCmd extends Cmd {
         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 = null;
-        if (ownerAppUserDtos.get(0).getMemberId().startsWith("-1")) {
-            //todo 这里考虑游客的情况
-            ownerDto = new OwnerDto();
-            ownerDto.setOwnerId(ownerAppUserDtos.get(0).getMemberId());
-            ownerDto.setMemberId(ownerAppUserDtos.get(0).getMemberId());
-            ownerDto.setName(ownerAppUserDtos.get(0).getAppUserName());
-            ownerDto.setLink(ownerAppUserDtos.get(0).getLink());
-            ownerDto.setCommunityId(ownerAppUserDtos.get(0).getCommunityId());
-        } else {
-            ownerDto = new OwnerDto();
-            ownerDto.setMemberId(ownerAppUserDtos.get(0).getMemberId());
-            ownerDto.setCommunityId(ownerAppUserDtos.get(0).getCommunityId());
-            List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
-            Assert.listOnlyOne(ownerDtos, "业主不存在");
-            ownerDto = ownerDtos.get(0);
-        }
-
-
-        // 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, "小区不存在，确保开发者账户配置默认小区" + ownerAppUserDtos.get(0).getCommunityId());
 
         //todo 生成 app 永久登录key
         UserDto tmpUserDto = userDtos.get(0);
@@ -159,21 +145,16 @@ public class OwnerUserLoginCmd extends Cmd {
 
         //todo 生成登录token
         String token = generatorLoginToken(tmpUserDto);
-
         LoginOwnerResDto loginOwnerResDto = new LoginOwnerResDto();
-        loginOwnerResDto.setOwnerId(ownerDto.getOwnerId());
-        loginOwnerResDto.setMemberId(ownerDto.getMemberId());
-        loginOwnerResDto.setOwnerName(ownerDto.getName());
-        loginOwnerResDto.setUserId(tmpUserDto.getUserId());
-        loginOwnerResDto.setUserName(tmpUserDto.getName());
-        loginOwnerResDto.setOwnerTel(ownerDto.getLink());
-        loginOwnerResDto.setCommunityId(ownerDto.getCommunityId());
+
+        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(tmpUserDto.getTel());
         loginOwnerResDto.setToken(token);
         loginOwnerResDto.setKey(newKey);
-        loginOwnerResDto.setOwnerTypeCd(ownerDto.getOwnerTypeCd());
-        loginOwnerResDto.setAppUserId(ownerAppUserDtos.get(0).getAppUserId());
         context.setResponseEntity(ResultVo.createResponseEntity(loginOwnerResDto));
 
     }
@@ -250,7 +231,7 @@ public class OwnerUserLoginCmd extends Cmd {
         List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
 
         // 说明业主不存在 直接返回跑异常
-        if (ownerDtos == null || ownerDtos.size() < 1) {
+        if (ListUtil.isNull(ownerDtos)) {
             return null;
         }