From a966dafb8877552267a94fe8c544c5ea72cf5650 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 16 六月 2025 09:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index 2c46dad..7558700 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -14,10 +14,12 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
import com.ruoyi.system.api.model.*;
+import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteShopService;
import com.ruoyi.system.api.service.RemoteUserService;
@@ -50,6 +52,8 @@
@Autowired
private RedisService redisService;
+ @Autowired
+ private RemoteConfigService remoteConfigService;
/**
* 登录
*/
@@ -135,15 +139,16 @@
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "很遗憾，访问IP已被列入系统黑名单",Constants.FROM_MINI_APP);
throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
}
+ String servicePhone = remoteConfigService.getServicePhone().getData();
if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
{
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除",Constants.FROM_MINI_APP);
- throw new ServiceException("对不起，您的账号： 已被删除");
+ throw new ServiceException(servicePhone,501);
}
if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
{
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员",Constants.FROM_MINI_APP);
- throw new ServiceException("对不起，您的账号： 已停用");
+ throw new ServiceException(servicePhone,501);
}
recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_MINI_APP);
}
@@ -203,6 +208,10 @@
{
throw new ServiceException(userResult.getMsg());
}
+ if (401 == userResult.getCode())
+ {
+ throw new ServiceException("商户已被冻结,请联系管理员",401);
+ }
QwH5LoginVo userInfo = userResult.getData();
SysUser user = userInfo.getSysUser();
String username = user.getUserName();
@@ -229,11 +238,28 @@
throw new ServiceException(userResult.getMsg());
}
ShopRelUserVo shopInfo = shopResult.getData();
- if(null == shopInfo){
+ if (null == shopInfo) {
throw new ServiceException("未查询到商户信息");
}
+ Long shopId = shopInfo.getShopId();
+ Shop shop = remoteShopService.getShop(shopId).getData();
+ if (-1 == shop.getShopStatus()) {
+ recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对应商户已删除，请联系管理员", Constants.FROM_SHOP);
+ throw new ServiceException("对应商户已删除，请联系管理员");
+ }
+ if (0 == shop.getShopStatus()) {
+ recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对应商户已冻结，请联系管理员", Constants.FROM_SHOP);
+ throw new ServiceException("对应商户已冻结，请联系管理员");
+ }
+ if (2 == shop.getShopStatus()) {
+ recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对应商户已终止合作，请联系管理员", Constants.FROM_SHOP);
+ throw new ServiceException("对应商户已终止合作，请联系管理员");
+ }
+
userInfo.setShopId(shopInfo.getShopId());
- recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_SHOP);
+ userInfo.setShopName(shopInfo.getShopName());
+ userInfo.setShopNum(shopInfo.getShopNum());
+ recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功", Constants.FROM_SHOP);
return userInfo;
}
@@ -276,11 +302,15 @@
if (R.FAIL == userResult.getCode()) {
throw new ServiceException(userResult.getMsg());
}
+// ShopRelUserVo shopInfo = shopResult.getData();
+// if(null == shopInfo){
+// throw new ServiceException("未查询到商户信息");
+// }
+// userInfo.setShopId(shopInfo.getShopId());
ShopRelUserVo shopInfo = shopResult.getData();
- if(null == shopInfo){
- throw new ServiceException("未查询到商户信息");
+ if(null != shopInfo){
+ userInfo.setShopId(shopInfo.getShopId());
}
- userInfo.setShopId(shopInfo.getShopId());
recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_SHOP);
return userInfo;
}
--
Gitblit v1.7.1