From d5dbdbe51435f2148f2545734a11c0630173a104 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 17 Jul 2023 16:14:27 +0800
Subject: [PATCH] 扫码和关注的事件

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   17 +++++------------
 1 files changed, 5 insertions(+), 12 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 b85ca93..45b8311 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
@@ -595,20 +595,12 @@
             }
 
             String openId = json.getString("openid");
-//            String sessionKey = json.getString("session_key");
+            String accessToken = json.getString("access_token");
             log.info("openId={}", openId);
             // 查询用户是否存在
-            MallMember mallMember = null;
-            synchronized (this) {
-                mallMember = this.baseMapper.selectMemberByOpenId(openId);
-                if (ObjectUtil.isEmpty(mallMember)) {
-                    // 新增用户
-//                    agentProducer.sendMemberSubMsg(openId);
-                    return febsResponse.fail().message("请先关注公众号");
-                } else {
-                    mallMember.setOpenId(openId);
-                    this.baseMapper.updateById(mallMember);
-                }
+            MallMember mallMember = this.baseMapper.selectMemberByOpenId(openId);
+            if (ObjectUtil.isEmpty(mallMember)) {
+                return febsResponse.fail().message("请先关注公众号");
             }
             // 存放redis
             String redisKey = AppContants.XCX_LOGIN_PREFIX + mallMember.getId();
@@ -627,6 +619,7 @@
             authInfo.put("appid", xcxProperties.getXcxAppid());
             authInfo.put("member", mallMember);
             authInfo.put("rasToken", generateAsaToken(token));
+            authInfo.put("accessToken",accessToken);
             febsResponse.success().data(authInfo);
         } else {
             return febsResponse.fail().message("自动登录失败");

--
Gitblit v1.9.1