Update app.py

app.py

@@ -624,7 +624,6 @@ def shop_order_new():
 
 
 
-# Работа из VK_ID Запись ордер с полными данными
 @app.route('/wr_order_vk_full', methods=['POST'])
 def write_order_vk_full():
     try:
@@ -644,6 +643,7 @@ def write_order_vk_full():
         status = request.form.get('status', '')
         del_flag = request.form.get('del', '')
         n_con_flag = request.form.get('n_con', '')
+        chat_id = request.form.get('chat_id', '')
 
         if not email or not phone:
             logging.error("Email and phone are required")
@@ -654,15 +654,10 @@ def write_order_vk_full():
         conn = sqlite3.connect(DATABASE_NEW)
         cursor = conn.cursor()
 
-        # Сначала ищем по email и phone
-        cursor.execute("SELECT * FROM contacts WHERE email = ? OR phone = ?", (email, phone))
+        # Ищем по email, phone, vk_id или chat_id
+        cursor.execute("SELECT * FROM contacts WHERE email = ? OR phone = ? OR vk_id = ? OR chat_id = ?", (email, phone, vkid, chat_id))
         result = cursor.fetchone()
 
-        # Если не найдено, ищем по vk_id
-        if not result:
-            cursor.execute("SELECT * FROM contacts WHERE vk_id = ?", (vkid,))
-            result = cursor.fetchone()
-
         if result:
             shop_st = result[17] if result[17] else '{}'
             shop_st_data = json.loads(shop_st)
@@ -683,13 +678,13 @@ def write_order_vk_full():
         msk_now = utc_now.replace(tzinfo=pytz.utc).astimezone(msk_tz)
         data_on = msk_now.strftime('%Y-%m-%d %H:%M:%S')
 
-        columns_to_update = ['name', 'phone', 'email', 'vk_id', 'orders', 'n_con', 'data_on']
-        values_to_update = [name, phone, email, vkid, shop_st_json, n_con_flag, data_on]
+        columns_to_update = ['name', 'phone', 'email', 'vk_id', 'chat_id', 'orders', 'n_con', 'data_on']
+        values_to_update = [name, phone, email, vkid, chat_id, shop_st_json, n_con_flag, data_on]
 
         if result:
             set_clause = ', '.join([f"{col} = ?" for col in columns_to_update])
-            query = f"UPDATE contacts SET {set_clause} WHERE email = ? OR phone = ? OR vk_id = ?"
-            cursor.execute(query, values_to_update + [email, phone, vkid])
+            query = f"UPDATE contacts SET {set_clause} WHERE email = ? OR phone = ? OR vk_id = ? OR chat_id = ?"
+            cursor.execute(query, values_to_update + [email, phone, vkid, chat_id])
         else:
             query = f"INSERT INTO contacts ({', '.join(columns_to_update)}) VALUES ({', '.join(['?' for _ in columns_to_update])})"
             cursor.execute(query, values_to_update)