From 157762192b4cce832a11595cafa67513a3917427 Mon Sep 17 00:00:00 2001
From: AKW <2497744746@qq.com>
Date: Wed, 27 Dec 2023 15:26:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/jqr/apps.py  | 8 +++++---
 apps/jqr/tasks.py | 3 +++
 apps/jqr/utils.py | 4 +++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/apps/jqr/apps.py b/apps/jqr/apps.py
index 29eb006..f3ca8b5 100644
--- a/apps/jqr/apps.py
+++ b/apps/jqr/apps.py
@@ -8,6 +8,8 @@ class JqrConfig(AppConfig):
     name = 'apps.jqr'
 
     def ready(self):
-        from apps.jqr.pubsub import JQREventNewUserCallbackPubSub
-        t = Thread(target=JQREventNewUserCallbackPubSub.event_callback_listener)
-        t.start()
+        from django.conf import settings
+        if not settings.DEBUG:
+            from apps.jqr.pubsub import JQREventNewUserCallbackPubSub
+            t = Thread(target=JQREventNewUserCallbackPubSub.event_callback_listener)
+            t.start()
diff --git a/apps/jqr/tasks.py b/apps/jqr/tasks.py
index 0b9c2f6..b0ace7d 100644
--- a/apps/jqr/tasks.py
+++ b/apps/jqr/tasks.py
@@ -6,6 +6,7 @@ from django.db.models import Count, Sum, When, Case, Value
 
 from apps.jqr.choices import JqrWechatbizuserinfoDeleteTypeChoices, JqrAddTypeChoices
 from apps.jqr.pubsub import JQRQrcodeCallbackPubSub
+from apps.jqr.utils import send_new_user_msg
 from apps.jqr.ws import WS
 from apps.qc.choices import QcWechatbizeventAddcontactIsDeleteChoices, QcQrcodesEditLogOperateTypeChoices, \
     QcQrcodesEditLogTypeChoices
@@ -79,6 +80,8 @@ def save_add_contact_by_channel(data, corpinfo, *args, **kwargs):
     edit_add_contact(data, corpinfo, *args, **kwargs)
     # 转化外部用户Id
     WS.transfer_external_userid_to_vid(corpid, userid, externaluserid)
+    # 发送新客欢迎
+    send_new_user_msg(corpid, userid, externaluserid)
 
 
 @shared_task(name='edit_add_contact', queue='contact')
diff --git a/apps/jqr/utils.py b/apps/jqr/utils.py
index e75c86c..377a091 100644
--- a/apps/jqr/utils.py
+++ b/apps/jqr/utils.py
@@ -91,7 +91,9 @@ def send_new_user_msg(corpid, userid, external_userid):
             logger.error(f'corpid: {corpid}, userid: {userid}, external_userid: {external_userid}, 发送新客欢迎失败')
             return
         status_code = WS.send_wx_work_msg(data)
-        return status_code == 200
+        success = status_code == 200
+        logger.info(
+            f'corpid: {corpid}, userid: {userid}, external_userid: {external_userid},发送新客欢迎消息成功状态:{success}')
     except Exception as e:
         logger.error(f'corpid: {corpid}, userid: {userid}, external_userid: {external_userid}, 发送新客欢迎失败: {e}')
         pass