From 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 13:48:56 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 8f42cb2..2d31c11 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
@@ -1,6 +1,8 @@
package com.ruoyi.auth.service;
import com.ruoyi.system.api.RemoteMemberService;
+import com.ruoyi.system.api.RemoteShopService;
+import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
import com.ruoyi.system.api.model.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -32,6 +34,9 @@
@Autowired
private RemoteMemberService remoteMemberService;
+
+ @Autowired
+ private RemoteShopService remoteShopService;
@Autowired
private SysPasswordService passwordService;
@@ -172,7 +177,16 @@
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
throw new ServiceException("对不起，您的账号：" + username + " 已停用");
}
+ // 查询用户商户
+ R<ShopRelUserVo> shopResult = remoteShopService.getShopByUserId(user.getUserId());
+ if (R.FAIL == userResult.getCode()) {
+ throw new ServiceException(userResult.getMsg());
+ }
+ ShopRelUserVo shopInfo = shopResult.getData();
+ userInfo.setShopId(shopInfo.getShopId());
+
recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
+
return userInfo;
}
--
Gitblit v1.7.1