From d1f758443f1690020640a4859c7c8e9b38facab3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 31 十二月 2024 09:25:47 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index 00d21b3..f4928cc 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/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());//妫�鏌ラ獙璇佺爜
@@ -446,6 +451,7 @@
systemUser = new SystemUser();
systemUser.setCreateTime(new Date());
+ systemUser.setCreateUser(1);
systemUser.setDeleted(Boolean.FALSE);
systemUser.setUsername(param.getPhone());
systemUser.setRealname(null);
@@ -458,14 +464,17 @@
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());
Company company = new Company();
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;
}
--
Gitblit v1.9.3