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 | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 5337b8f..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
@@ -238,26 +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);
+ 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);
+ 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);
+ 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;
}
--
Gitblit v1.7.1