From 5ad0eea8541725bab6ae82becad90b408abac2f7 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Mon, 5 Aug 2024 09:51:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=AE=A2=E9=98=85=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81=E7=94=9F=E6=88=90=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/controller/CommonController.java   | 5 +++--
 .../system/cashierservice/wxUtil/WxAccountUtil.java          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java
index e0f3a47..79ca76c 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java
@@ -208,7 +208,6 @@ public class CommonController {
         redisUtil.getIncrNum(key, "2");
     }
 
-
     /**
      * 订阅消息
      * @param wxMsgSubDTO
@@ -220,7 +219,9 @@ public class CommonController {
         if (wxMsgSubDTO.getOpenId() == null || wxMsgSubDTO.getShopId() == null) {
             return Result.fail("shopId或openId缺失");
         }
-        loginService.addShopId(wxMsgSubDTO.getOpenId(), wxMsgSubDTO.getShopId(), wxMsgSubDTO.getType());
+        String msg = wxMsgSubDTO.getShopId().replace("msg", "");
+        String[] split = msg.split(",");
+        loginService.addShopId(wxMsgSubDTO.getOpenId(), split[0], split.length > 1 ? Integer.valueOf(split[1]) : null);
         return Result.success(CodeEnum.SUCCESS);
     }
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/wxUtil/WxAccountUtil.java b/src/main/java/com/chaozhanggui/system/cashierservice/wxUtil/WxAccountUtil.java
index 62349d0..35e9098 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/wxUtil/WxAccountUtil.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/wxUtil/WxAccountUtil.java
@@ -53,7 +53,7 @@ public class WxAccountUtil {
         req.put("action_name", "QR_STR_SCENE");
         HashMap<Object, Object> actionInfo = new HashMap<>();
         HashMap<String, Object> scene = new HashMap<>();
-        scene.put("scene_str", "msg" + shopId + ":" + type);
+        scene.put("scene_str", "msg" + shopId + "," + type);
         actionInfo.put("scene", scene);
         req.put("action_info", actionInfo);
         log.info("开始获取公众号二维码, 请求数据: {}", req);