From 867078372922bd35931f2275d31421194ee526aa Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Thu, 27 Feb 2025 11:05:20 +0800
Subject: [PATCH] update

---
 app/api/endpoints/wechat.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/api/endpoints/wechat.py b/app/api/endpoints/wechat.py
index 8e1b8b7..4badafa 100644
--- a/app/api/endpoints/wechat.py
+++ b/app/api/endpoints/wechat.py
@@ -67,12 +67,18 @@ async def wechat_phone_login(
             return error_response(code=400, message="手机号为空")
         
         # # 获取企业微信的 userid
-        # wecom_client = WecomClient()
-        # wecom_info = await wecom_client.miniprogram_to_userid(openid)
-        # print(f"获取到的企业微信用户信息: {wecom_info}")
-        # if not wecom_info:
-        #     return error_response(code=400, message="获取企业微信用户id失败")
+        wecom_client = WecomClient()
+        wecom_info = await wecom_client.miniprogram_to_userid(openid)
+        print(f"获取到的企业微信用户信息: {wecom_info}")
         
+        wecom_userid = None
+        wecom_pending_id = None
+        
+        if wecom_info:
+            wecom_userid = wecom_info.get("userid")
+            wecom_pending_id = wecom_info.get("pending_id")
+
+
         # 查找或创建用户
         user = db.query(UserDB).filter(UserDB.phone == phone).first()
         if not user:
@@ -87,8 +93,8 @@ async def wechat_phone_login(
                 password=get_password_hash("123456"),
                 openid=openid,  # 保存 openid
                 unionid=unionid,  # 保存 unionid
-                # wecom_userid=wecom_info.get("userid"),
-                # wecom_pending_id=wecom_info.get("pending_id")
+                wecom_userid=wecom_userid,
+                wecom_pending_id=wecom_pending_id
             )
             db.add(user)
             db.flush()
@@ -100,6 +106,8 @@ async def wechat_phone_login(
             # 更新现有用户的 openid 和 unionid
             user.openid = openid
             user.unionid = unionid
+            user.wecom_userid = wecom_userid
+            user.wecom_pending_id = wecom_pending_id
             db.commit()
         
         # 创建访问令牌