From 3aa7d6702ce557d76fcfd4537f21ce3b32d36299 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 17 Jul 2023 15:43:35 +0800
Subject: [PATCH] 扫码和关注的事件

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java         |    2 ++
 src/main/resources/application-dev.yml                                       |    2 +-
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |    9 +++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 62a5254..694cdee 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -185,6 +185,7 @@
         mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.name());
         mallMember.setSex("男");
         mallMember.setBindPhone(null);
+        mallMember.setOpenId(memberOpenId);
         memberMapper.insert(mallMember);
         //生成邀请码
         String inviteId = ShareCodeUtil.toSerialCode(mallMember.getId());
@@ -244,6 +245,7 @@
         mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.name());
         mallMember.setSex("男");
         mallMember.setBindPhone(null);
+        mallMember.setOpenId(openId);
         memberMapper.insert(mallMember);
         //生成邀请码
         String inviteId = ShareCodeUtil.toSerialCode(mallMember.getId());
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..b85ca93 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,17 +595,18 @@
             }
 
             String openId = json.getString("openid");
-            String sessionKey = json.getString("session_key");
-            log.info("openId={},sessionKey={}", openId, sessionKey);
+//            String sessionKey = json.getString("session_key");
+            log.info("openId={}", openId);
             // 查询用户是否存在
             MallMember mallMember = null;
             synchronized (this) {
                 mallMember = this.baseMapper.selectMemberByOpenId(openId);
                 if (ObjectUtil.isEmpty(mallMember)) {
                     // 新增用户
-                    agentProducer.sendMemberSubMsg(openId);
+//                    agentProducer.sendMemberSubMsg(openId);
+                    return febsResponse.fail().message("请先关注公众号");
                 } else {
-                    mallMember.setSessionKey(sessionKey);
+                    mallMember.setOpenId(openId);
                     this.baseMapper.updateById(mallMember);
                 }
             }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 31f4d3f..1e8a6a3 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -68,7 +68,7 @@
     domain: https://openapi.alipaydev.com/gateway.do
 
 xcx:
-  wechar_login_url: https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
+  wechar_login_url: https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code
   xcx_appid: wx052716b1a388b13c
   xcx_secret: e7cf355e7234f035d8fea6a3a19513b9
   debug: false

--
Gitblit v1.9.1