From 0fa6ef6e106f537d1d4b521080d65c59c5bd4f8d Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Thu, 11 Jan 2024 16:51:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C=E3=80=81?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80=20=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CtleaveMessageServiceImpl.java       | 21 +++++++++-------
 .../service/impl/WxUserMemberServiceImpl.java | 24 ++++++++++++-------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java
index 471a480..e4c45b4 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java
@@ -34,15 +34,18 @@ public class CtleaveMessageServiceImpl implements ICtleaveMeassageService {
     public int saveCtleaveMeassage(CtLeaveMessage ctLeaveMessage) {
         // 留言成功发送消息
         WxScriptMessage wxScriptMessage = wxScriptMessageMapper.selectOneByMessageType(MessageTypeEnum.SUBMIT_MESSAGE.getCode());
-        WxUserScriptLog wxUserScriptLog = new WxUserScriptLog();
-        BeanUtils.copyProperties(wxScriptMessage, wxUserScriptLog);
-        wxUserScriptLog.setId(null);
-        wxUserScriptLog.setWxUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
-        wxUserScriptLog.setMessageType(WxUserIntegralMessageTypeEnum.USER_REGISTRATION.getCode());
-        wxUserScriptLog.setIsCustom(0);
-        wxUserScriptLog.setTitile(wxScriptMessage.getMessageTitle());
-        wxUserScriptLog.setContent(wxScriptMessage.getMessageContent());
-        wxUserScriptLogMapper.insertWxUserScriptLog(wxUserScriptLog);
+        if (wxScriptMessage != null) {
+            WxUserScriptLog wxUserScriptLog = new WxUserScriptLog();
+            BeanUtils.copyProperties(wxScriptMessage, wxUserScriptLog);
+            wxUserScriptLog.setId(null);
+            wxUserScriptLog.setWxUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
+            wxUserScriptLog.setMessageType(WxUserIntegralMessageTypeEnum.USER_REGISTRATION.getCode());
+            wxUserScriptLog.setIsCustom(0);
+            wxUserScriptLog.setTitile(wxScriptMessage.getMessageTitle());
+            wxUserScriptLog.setContent(wxScriptMessage.getMessageContent());
+            wxUserScriptLogMapper.insertWxUserScriptLog(wxUserScriptLog);
+        }
+
 
         // 保存消息
         CtLeaveMessageEnum ctLeaveMessageEnum = CtLeaveMessageEnum.fromString(ctLeaveMessage.getSource());
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java
index b7bdb86..90057f1 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java
@@ -55,6 +55,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
     private WxUserScriptLogMapper wxUserScriptLogMapper;
 
     @Override
+    @Transactional
     public LoginUserVo login(String code) throws Exception {
         // 1、使用临时凭证 code 获取 appi + appsecret + unionid
         String result = MiniProgramUtils.getSessionKeyAndOpenId(code);
@@ -80,6 +81,9 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
             // 2.2、微信用户表注册
             wxUserMemberMapper.insertWxUserMember(wxUserMember);
             // 2.3、系统表注册
+            /**
+             * TODO: 分布式事务
+             */
             RegisterBody registerBody = new RegisterBody();
             registerBody.setUsername(wxUserMember.getOpenid());
             registerBody.setPassword(UserConstants.WX_SYSTEM_USER_PASSWORD);
@@ -90,15 +94,17 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
             }
             // 2.4、用户注册成功发送消息
             WxScriptMessage wxScriptMessage = wxScriptMessageMapper.selectOneByMessageType(MessageTypeEnum.USER_REGISTRATION.getCode());
-            WxUserScriptLog wxUserScriptLog = new WxUserScriptLog();
-            BeanUtils.copyProperties(wxScriptMessage, wxUserScriptLog);
-            wxUserScriptLog.setId(null);
-            wxUserScriptLog.setWxUserId(wxUserMember.getId());
-            wxUserScriptLog.setMessageType(WxUserIntegralMessageTypeEnum.USER_REGISTRATION.getCode());
-            wxUserScriptLog.setIsCustom(0);
-            wxUserScriptLog.setTitile(wxScriptMessage.getMessageTitle());
-            wxUserScriptLog.setContent(wxScriptMessage.getMessageContent());
-            wxUserScriptLogMapper.insertWxUserScriptLog(wxUserScriptLog);
+            if (wxScriptMessage != null) {
+                WxUserScriptLog wxUserScriptLog = new WxUserScriptLog();
+                BeanUtils.copyProperties(wxScriptMessage, wxUserScriptLog);
+                wxUserScriptLog.setId(null);
+                wxUserScriptLog.setWxUserId(wxUserMember.getId());
+                wxUserScriptLog.setMessageType(WxUserIntegralMessageTypeEnum.USER_REGISTRATION.getCode());
+                wxUserScriptLog.setIsCustom(0);
+                wxUserScriptLog.setTitile(wxScriptMessage.getMessageTitle());
+                wxUserScriptLog.setContent(wxScriptMessage.getMessageContent());
+                wxUserScriptLogMapper.insertWxUserScriptLog(wxUserScriptLog);
+            }
         }
 
         // 3、登录请求，获取 token