费用导入修复2025/08/15

chengf

2025-08-15 1ac555ce49a45e2c7fc015dbb16b104840788c21

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

@@ -17,20 +17,16 @@
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;
@@ -118,10 +114,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);
        }

@@ -197,7 +193,7 @@
        List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);

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

@@ -220,10 +216,9 @@
        if (flag < 1) {
            throw new CmdException("注册失败");
        }

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