From cc9ce86cc24c413c9cbd303b8bb4fd9f5ec5a30f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 Jul 2023 10:04:53 +0800
Subject: [PATCH] 赠送积分更新状态

---
 src/main/java/cc/mrbird/febs/pay/util/WechatEventUtil.java |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/pay/util/WechatEventUtil.java b/src/main/java/cc/mrbird/febs/pay/util/WechatEventUtil.java
index 9760c49..c773cc1 100644
--- a/src/main/java/cc/mrbird/febs/pay/util/WechatEventUtil.java
+++ b/src/main/java/cc/mrbird/febs/pay/util/WechatEventUtil.java
@@ -112,21 +112,27 @@
                      */
                     String eventKey = map.get("EventKey");
                     if(StrUtil.isNotEmpty(eventKey)){
-                        stringBuffer.append(eventKey);
-                        stringBuffer.append("-");
+
+                        String[] eventKeyStr = StrUtil.split(eventKey, "_");
+                        stringBuffer.append(eventKeyStr[1]);
+                        stringBuffer.append("@");
                         stringBuffer.append(fromUserName);
                         agentProducer.sendMemberSubScanMsg(stringBuffer.toString());
                     }
+                }else{
+                    /**
+                     * 普通关注事件
+                     */
+                    agentProducer.sendMemberSubMsg(fromUserName);
                 }
-                /**
-                 * 普通关注事件
-                 */
-                agentProducer.sendMemberSubMsg(fromUserName);
             } else if ("unsubscribe".equals(eventType)) {
                 log.info("取消关注事件:toUserName{}、fromUserName{}", toUserName, fromUserName);
+                //取消关注则退出商城
                 MallMember mallMember = mallMemberMapper.selectMemberByOpenId(fromUserName);
-                redisUtils.del(AppContants.XCX_LOGIN_PREFIX + mallMember.getId());
-                redisUtils.del(AppContants.XCX_LOGIN_PHONE_PREFIX + mallMember.getId());
+                if(ObjectUtil.isNotEmpty(mallMember)){
+                    redisUtils.del(AppContants.XCX_LOGIN_PREFIX + mallMember.getId());
+                    redisUtils.del(AppContants.XCX_LOGIN_PHONE_PREFIX + mallMember.getId());
+                }
             }else if ("SCAN".equals(eventType)) {
                 log.info("扫码关注事件:toUserName{}、fromUserName{}", toUserName, fromUserName);
                 if(map.containsKey("EventKey")){
@@ -136,12 +142,18 @@
                      */
                     String eventKey = map.get("EventKey");
                     if(StrUtil.isNotEmpty(eventKey)){
-                        stringBuffer.append(eventKey);
+                        String[] eventKeyStr = StrUtil.split(eventKey, "_");
+                        stringBuffer.append(eventKeyStr[1]);
                         stringBuffer.append("@");
                         stringBuffer.append(fromUserName);
                         agentProducer.sendMemberSubScanMsg(stringBuffer.toString());
                     }
                 }
+            }else if ("VIEW".equals(eventType)) {
+                /**
+                 * 普通关注事件
+                 */
+                agentProducer.sendMemberSubMsg(fromUserName);
             }
         }
         return result;

--
Gitblit v1.9.1