From 4e0017bad42e75ccf53d04fb7a6eba029de1299a Mon Sep 17 00:00:00 2001
From: AKW <2497744746@qq.com>
Date: Thu, 28 Dec 2023 14:30:15 +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/ksy_http.py | 8 +++++---
 apps/jqr/tasks.py    | 8 ++++++--
 apps/jqr/utils.py    | 4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/apps/jqr/ksy_http.py b/apps/jqr/ksy_http.py
index 8f32dd7..2dddcd3 100644
--- a/apps/jqr/ksy_http.py
+++ b/apps/jqr/ksy_http.py
@@ -5,12 +5,14 @@ class Http(object):
     BASE_URL = 'http://114.215.169.94:7035'
 
     @classmethod
-    def get_new_user_msg(cls, corpid, userid, external_userid):
+    def get_new_user_msg(cls, corpid, userid, external_userid, uid=None):
+        uid = uid or 3
         url = f'{cls.BASE_URL}/api/newusermsg/getnewusermsg'
         params = {
             'corpId': corpid,
             'userId': userid,
-            'externalUserId': external_userid
+            'externalUserId': external_userid,
+            'uId': uid,
         }
         res = requests.get(url, params=params)
         if res.status_code == 200:
@@ -19,6 +21,6 @@ class Http(object):
 
 
 if __name__ == '__main__':
-    success, data = Http.get_new_user_msg('wwa580898a6c9c8b00', 'YiYi', 'wm_OXWbAAA95oyAZ4qi3494eDcKnAM5Q')
+    success, data = Http.get_new_user_msg('ww4450b72962300373', 'mg04598', 'wmAHf_bwAA90A6vdT0dDsWyqZJGgJOIg')
     print(success)
     print(data)
diff --git a/apps/jqr/tasks.py b/apps/jqr/tasks.py
index e0eb0ac..e9aca2a 100644
--- a/apps/jqr/tasks.py
+++ b/apps/jqr/tasks.py
@@ -11,7 +11,7 @@ from apps.jqr.ws import WS
 from apps.qc.choices import QcWechatbizeventAddcontactIsDeleteChoices, QcQrcodesEditLogOperateTypeChoices, \
     QcQrcodesEditLogTypeChoices
 from apps.qc.models import QcWechatbizeventAddcontact, QcQrcodes, QcWechatbizuserinfo, QcQrcodesEditLog, QcCorpinfo
-from apps.jqr.models import JqrExternalFollowUser, JqrExternalUser
+from apps.jqr.models import JqrExternalFollowUser, JqrExternalUser, JqrHookUser
 from apps.qc.utils import generate_qrcode_by_qrcode
 from apps.warning.models import QcWarningRule, WarningLog, WarningSetting
 from libs.wechat import WechatWorkerUtil
@@ -81,7 +81,11 @@ def save_add_contact_by_channel(data, corpinfo, *args, **kwargs):
     # # 转化外部用户Id
     # WS.transfer_external_userid_to_vid(corpid, userid, externaluserid)
     # 发送新客欢迎
-    send_new_user_msg(corpid, userid, externaluserid)
+    uid = None
+    hook_user = JqrHookUser.objects.filter(corpid=corpid, userid=userid).first()
+    if hook_user is not None:
+        uid = hook_user.uid
+    send_new_user_msg(corpid, userid, externaluserid, uid=uid)
 
 
 @shared_task(name='edit_add_contact', queue='contact')
diff --git a/apps/jqr/utils.py b/apps/jqr/utils.py
index ccce2f6..ba064dd 100644
--- a/apps/jqr/utils.py
+++ b/apps/jqr/utils.py
@@ -83,10 +83,10 @@ def get_jqr_new_send_msg_info(corpid, userid, external_userid):
                 pass
 
 
-def send_new_user_msg(corpid, userid, external_userid):
+def send_new_user_msg(corpid, userid, external_userid, uid=None):
     # 发送新客欢迎
     try:
-        success, data = Http.get_new_user_msg(corpid, userid, external_userid)
+        success, data = Http.get_new_user_msg(corpid, userid, external_userid, uid=uid)
         logger.info(f'send new user msg http ---> success: {success}, data: {data}')
         if not success:
             logger.error(f'corpid: {corpid}, userid: {userid}, external_userid: {external_userid}, 发送新客欢迎失败')