From bf202fda03d21720dd91b411507eec703ac4e0a9 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 24 Mar 2026 11:14:23 +0800
Subject: [PATCH] fix(yinhe): 修复公司级别限制logo的比较逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 5d7d762..db77682 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
@@ -797,15 +797,17 @@
redisUtils.del(existToken);
}
}
+ YhAiMember yhAiMember = yhAiMemberMapper.selectById(entity.getId());
String token = IdUtil.simpleUUID();
- redisUtils.set(token, JSONObject.toJSONString(entity), -1);
+ redisUtils.set(token, JSONObject.toJSONString(yhAiMember), -1);
redisUtils.set(redisKey, token, -1);
Map<String, Object> authInfo = new HashMap<>();
authInfo.put("token", token);
authInfo.put("appid", xcxProperties.getXcxAppid());
- YhAiMember yhAiMember = yhAiMemberMapper.selectById(entity.getId());
authInfo.put("member", yhAiMember);
- authInfo.put("rasToken", generateAsaToken(token));
+ String rasToken = generateAsaToken(token);
+ authInfo.put("rasToken", rasToken);
+ log.info("登录成功rasToken={}", rasToken);
febsResponse.success().data(authInfo);
} else {
return febsResponse.fail().message("自动登录失败");
@@ -860,8 +862,8 @@
if (ObjectUtil.isNotEmpty(aiCompany)){
companyId = aiCompany.getId();
}
+ entity.setCompanyId(companyId);
}
- entity.setCompanyId(companyId);
yhAiMemberMapper.updateById(entity);
return new FebsResponse().success();
@@ -2097,6 +2099,13 @@
return new FebsResponse().success().message("操作成功");
}
+ @Override
+ public FebsResponse getCompanyCode() {
+
+ String companyCode = yhAiCompanyMapper.selectDictLabel("xcx_register_default","default");
+ return new FebsResponse().success().data(companyCode);
+ }
+
// public static void main(String[] args) {
// Long userld = 16425L;
// String shopAccount = "爱和美医疗";
--
Gitblit v1.9.1