From 977ce849c1ae60a3f5dde8a3313d4b4cfd484fd0 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 24 Mar 2026 20:58:41 +0800
Subject: [PATCH] ``` refactor(yhAiServiceImpl): 移除智能体权限检查逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 66d0214..905bc42 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -708,14 +708,19 @@
@Override
@Transactional
- public FebsResponse xcxLogin(ApiXcxLoginDto apiXcxLoginDto) throws IOException {
+ public FebsResponse xcxLogin(ApiXcxLoginDto apiXcxLoginDto){
log.info("登录请求参数：{}", JSONObject.toJSONString(apiXcxLoginDto));
FebsResponse febsResponse = new FebsResponse();
String code = apiXcxLoginDto.getCode();
log.info("code:" + code);
if (StrUtil.isNotBlank(code)) {
String requrl = getXcxLoginUrl(code);
- String reslutData = HttpCurlUtil.sendGetHttp(requrl, null);
+ String reslutData = null;
+ try {
+ reslutData = HttpCurlUtil.sendGetHttp(requrl, null);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(reslutData);
log.info("微信登录获取到登录信息={}", json);
@@ -742,6 +747,8 @@
entity.setSessionKey(sessionKey);
entity.setMemberUuid(UUID.getSimpleUUIDString());
+
+ log.info("公司编码={}", apiXcxLoginDto.getCompanyId());
if (StrUtil.isNotEmpty(apiXcxLoginDto.getCompanyId())){
YHAiCompany aiCompany = yhAiCompanyMapper.selectOne(
Wrappers.lambdaQuery(YHAiCompany.class)
@@ -783,7 +790,7 @@
entity.setInviteId(inviteId);
yhAiMemberMapper.updateById(entity);
} else {
- if ("1".equals(entity.getAccountStatus())) {
+ if (entity.getAccountStatus() == 1) {
throw new FebsException("账号已停用");
}
entity.setSessionKey(sessionKey);
@@ -863,6 +870,25 @@
throw new FebsException("公司编码不存在");
}
if (ObjectUtil.isNotEmpty(aiCompany)){
+ String levelCode = aiCompany.getLevelCode();
+ YHSysCompanyLevel yhSysCompanyLevel = yhSysCompanyLevelMapper.selectOne(
+ Wrappers.lambdaQuery(YHSysCompanyLevel.class)
+ .eq(YHSysCompanyLevel::getCode, levelCode)
+ );
+ Integer memberNum = yhSysCompanyLevel.getMemberNum();
+ List<YhAiMember> yhAiMembers = yhAiMemberMapper.selectList(
+ Wrappers.lambdaQuery(YhAiMember.class)
+ .eq(YhAiMember::getCompanyId, aiCompany.getId())
+ .isNull(YhAiMember::getRoleId)
+ );
+ Integer realNum = CollUtil.isEmpty(yhAiMembers) ? 0 : yhAiMembers.size();
+ log.info("公司会员数：{}", realNum);
+ log.info("公司会员数：{}", memberNum);
+ log.info("公司会员数：{}", realNum >= memberNum);
+ if (realNum >= memberNum){
+ throw new FebsException("公司会员已满");
+ }
+
companyId = aiCompany.getId();
}
entity.setCompanyId(companyId);
--
Gitblit v1.9.1