From 4fe7d356651b0ddd13cc4c57465ff98862e8d416 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 19 Jul 2023 17:34:01 +0800
Subject: [PATCH] 商城商品修改

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   20 ++++++++------------
 1 files changed, 8 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 b22e029..37289ce 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,19 +595,12 @@
             }
 
             String openId = json.getString("openid");
-            String sessionKey = json.getString("session_key");
-            log.info("openId={},sessionKey={}", openId, sessionKey);
+            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);
-                } else {
-                    mallMember.setSessionKey(sessionKey);
-                    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();
@@ -626,6 +619,9 @@
             authInfo.put("appid", xcxProperties.getXcxAppid());
             authInfo.put("member", mallMember);
             authInfo.put("rasToken", generateAsaToken(token));
+            authInfo.put("accessToken",accessToken);
+            authInfo.put("openId",openId);
+            agentProducer.sendMemberInfoMsg(accessToken+"|"+openId);
             febsResponse.success().data(authInfo);
         } else {
             return febsResponse.fail().message("自动登录失败");

--
Gitblit v1.9.1