最新版本541200007

jiangping

2024-12-30 43c7cf553e5c78d81b8f23a043901926c45eb0cf

 server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java

@@ -35,6 +35,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -58,8 +59,10 @@
    private MemberMapper memberMapper;
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @Lazy
    @Autowired
    private SystemUserMapper systemUserMapper;
    @Lazy

    @Autowired
    private SmsEmailMapper smsEmailMapper;
@@ -74,9 +77,10 @@
    @Lazy
    @Autowired
    private SystemPermissionService systemPermissionService;

    @Lazy
    @Autowired
    private CaptchaService captchaService;
    @Lazy

    @Autowired
    private SystemLoginLogService systemLoginLogService;
@@ -411,6 +415,7 @@
    }

    @Override
    @Transactional
    public LoginUserInfo loginDriverWithCode(LoginPhoneDTO param, ServerHttpRequest request) {
        isCaptcheValide(param.getPhone(),param.getCode());//检查验证码

@@ -458,6 +463,10 @@
            systemUser.setSource(Constants.TWO);
            systemUser.setOpenid(param.getOpenid());
            systemUserMapper.insert(systemUser);
        }else{
            if(!Constants.equalsInteger(systemUser.getType(),Constants.memberType.driver)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，请使用正确的司机账号登陆！");
            }
        }

        dealOpenIdBiz(systemUser,param.getOpenid());
@@ -465,7 +474,7 @@
        if(Objects.nonNull(systemUser.getCompanyId())){
            company = companyMapper.selectById(systemUser.getCompanyId());
        }
        LoginUserInfo userInfo = LoginUserInfo.from(systemUser, null, null,null,null);
        LoginUserInfo userInfo = LoginUserInfo.from(systemUser, null, null,company,null);
        return  userInfo;
    }