折扣已完成现有需求2025/08/09

cgf

2025-08-23 9ec0a61f90ac2464eebc643bfe2d93ac9ba6e569

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

@@ -17,23 +17,20 @@
import com.java110.dto.user.UserDto;
import com.java110.intf.common.ISmsInnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.community.ICommunityV1InnerServiceSMO;
import com.java110.intf.user.*;
import com.java110.po.owner.OwnerAppUserPo;
import com.java110.po.user.UserPo;
import com.java110.po.userAttr.UserAttrPo;
import com.java110.po.user.UserAttrPo;
import com.java110.utils.constant.CommonConstant;
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;
import org.springframework.util.CollectionUtils;

import java.util.HashMap;
import java.util.List;
@@ -118,10 +115,10 @@
        List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);

        //todo 验证码登录，判断是否是否业主，并且是否绑定关系 如果没有 自动绑定关系
        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 SMOException(errorInfo);
        }

@@ -159,6 +156,14 @@
            tmpUserDto.setPassword("");
            tmpUserDto.setToken(token);
            tmpUserDto.setKey(newKey);
            //查询认证关系
            OwnerAppUserDto dto = new OwnerAppUserDto();
            dto.setUserId(userDtos.get(0).getUserId());
            dto.setLink(userDtos.get(0).getTel());
            List<OwnerAppUserDto> dtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(dto);
            if(!CollectionUtils.isEmpty(dtos)){
                tmpUserDto.setAuditState(dtos.get(0).getState());
            }
            context.setResponseEntity(ResultVo.createResponseEntity(tmpUserDto));
        } catch (Exception e) {
            logger.error("登录异常：", e);
@@ -197,7 +202,7 @@
        List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);

        // 说明业主不存在 直接返回跑异常
        if (ownerDtos == null || ownerDtos.size() < 1) {
        if (ListUtil.isNull(ownerDtos)) {
            return null;
        }

@@ -220,30 +225,34 @@
        if (flag < 1) {
            throw new CmdException("注册失败");
        }

        OwnerAppUserPo ownerAppUserPo = new OwnerAppUserPo();
        //状态类型，10000 审核中，12000 审核成功，13000 审核失败
        ownerAppUserPo.setState("12000");
        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");

        flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
        if (flag < 1) {
            throw new CmdException("添加用户业主关系失败");
        }

        UserDto userDto = new UserDto();
        userDto.setUserId(userPo.getUserId());
        List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
        //用userId和手机号查询绑定关系，没有则新增
        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");
            flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
            if (flag < 1) {
                throw new CmdException("添加用户业主关系失败");
            }
        }
        return userDtos;
    }