123

2_PRODUCT_FACTORY/dz_batch_factory.js

@@ -268,6 +268,7 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                     const main_info = list[index];
                     data.main_id = main_info.id
                     data.main_name = main_info.main_name
+                    let butler_id = main_info.butler_id
                     if(main_info.tg_link_config==undefined||main_info.tg_link_config==null){
                         console.error("主体配置推广链接错误：",main_info)
                     }else{
@@ -293,7 +294,8 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                                     main_id:data.main_id,
                                     promotion_id:"",
                                     wait_status:0,
-                                    material_platform_id:material_platform_id
+                                    material_platform_id:material_platform_id,
+                                    butler_id:butler_id
                                 })
                             }
                         }

2_PRODUCT_FACTORY/fq_factory.js

@@ -293,6 +293,7 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                     const main_info = list[index];
                     data.main_id = main_info.id
                     data.main_name = main_info.main_name
+                    let butler_id = main_info.butler_id
                     if(main_info.tg_link_config==undefined||main_info.tg_link_config==null){
                         console.error("主体配置推广链接错误：",main_info)
                     }else{
@@ -318,7 +319,8 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                                     main_id:data.main_id,
                                     promotion_id:"",
                                     wait_status:0,
-                                    material_platform_id:material_platform_id
+                                    material_platform_id:material_platform_id,
+                                    butler_id:butler_id
                                 })
                             }
                         }

2_PRODUCT_FACTORY/fq_mf_factory.js

@@ -233,6 +233,7 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                 const main_info = list[index];
                 data.main_id = main_info.id
                 data.main_name = main_info.main_name
+                let butler_id = main_info.butler_id
                 if(main_info.tg_link_config==undefined||main_info.tg_link_config==null){
                     console.error("主体配置推广链接错误：",main_info)
                 }else{
@@ -258,7 +259,8 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                                 main_id:data.main_id,
                                 promotion_id:"",
                                 wait_status:0,
-                                material_platform_id:material_platform_id
+                                material_platform_id:material_platform_id,
+                                butler_id:butler_id 
                             })
                         }
                     }

2_PRODUCT_FACTORY/hy_batch_factory.js

@@ -331,6 +331,7 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                     const main_info = list[index];
                     data.main_id = main_info.id
                     data.main_name = main_info.main_name
+                    let butler_id = main_info.butler_id
                     if(main_info.tg_link_config==undefined||main_info.tg_link_config==null){
                         console.error("主体配置推广链接错误：",main_info)
                     }else{
@@ -356,7 +357,8 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                                     main_id:data.main_id,
                                     promotion_id:"",
                                     wait_status:0,
-                                    material_platform_id:material_platform_id
+                                    material_platform_id:material_platform_id,
+                                    butler_id:butler_id
                                 }
 
                                 if(main_info.pay_type==0){

2_PRODUCT_FACTORY/qm_batch_factory.js

@@ -278,6 +278,7 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                     const main_info = list[index];
                     data.main_id = main_info.id
                     data.main_name = main_info.main_name
+                    let butler_id = main_info.butler_id
                     if(main_info.tg_link_config==undefined||main_info.tg_link_config==null){
                         console.error("主体配置推广链接错误：",main_info)
                     }else{
@@ -303,7 +304,8 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                                     main_id:data.main_id,
                                     promotion_id:"",
                                     wait_status:0,
-                                    material_platform_id:material_platform_id
+                                    material_platform_id:material_platform_id,
+                                    butler_id:butler_id
                                 })
                             }
                         }

2_PRODUCT_FACTORY/qm_mf_batch_factory.js

@@ -278,6 +278,7 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                     const main_info = list[index];
                     data.main_id = main_info.id
                     data.main_name = main_info.main_name
+                    let butler_id = main_info.butler_id
                     if(main_info.tg_link_config==undefined||main_info.tg_link_config==null){
                         console.error("主体配置推广链接错误：",main_info)
                     }else{
@@ -303,7 +304,8 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                                     main_id:data.main_id,
                                     promotion_id:"",
                                     wait_status:0,
-                                    material_platform_id:material_platform_id
+                                    material_platform_id:material_platform_id,
+                                    butler_id:butler_id
                                 })
                             }
                         }

2_PRODUCT_FACTORY/yw_batch_factory.js

@@ -279,6 +279,7 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                     const main_info = list[index];
                     data.main_id = main_info.id
                     data.main_name = main_info.main_name
+                    let butler_id = main_info.butler_id
                     if(main_info.tg_link_config==undefined||main_info.tg_link_config==null){
                         console.error("主体配置推广链接错误：",main_info)
                     }else{
@@ -304,7 +305,8 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                                     main_id:data.main_id,
                                     promotion_id:"",
                                     wait_status:0,
-                                    material_platform_id:material_platform_id
+                                    material_platform_id:material_platform_id,
+                                    butler_id:butler_id
                                 })
                             }
                         }

2_PRODUCT_FACTORY/zh_batch_factory.js

@@ -270,6 +270,7 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                     const main_info = list[index];
                     data.main_id = main_info.id
                     data.main_name = main_info.main_name
+                    let butler_id = main_info.butler_id
                     if(main_info.tg_link_config==undefined||main_info.tg_link_config==null){
                         console.error("主体配置推广链接错误：",main_info)
                     }else{
@@ -296,7 +297,8 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                                     main_id:data.main_id,
                                     promotion_id:"",
                                     wait_status:0,
-                                    material_platform_id:material_platform_id
+                                    material_platform_id:material_platform_id,
+                                    butler_id:butler_id
                                 })
                             }
                         }

MAIN_SERVE_FACTORY/MAIN_SERVE_FACTORY.js

@@ -61,7 +61,8 @@ async function processSyncMainTask(){
                 0,
                 0,
                 material_platform_id,
-                item.product_parent_id
+                item.product_parent_id,
+                main_info.butler_id
             ]);
             // let table_name = "video_applet_product"
             // const insertSQL = `
@@ -72,7 +73,7 @@ async function processSyncMainTask(){
             // `;
             const insertSQL = `
             INSERT INTO video_applet_product
-            (product_name, product_id, book_platform, main_id, dy_small_applet_app_id, status, wait_status,material_platform_id,product_parent_id)
+            (product_name, product_id, book_platform, main_id, dy_small_applet_app_id, status, wait_status,material_platform_id,product_parent_id,butler_id)
             VALUES ?
             ON DUPLICATE KEY UPDATE 
                 product_name = VALUES(product_name),

logs/combined.log

@@ -1,4 +1,35 @@
+<<<<<<< HEAD
 2025-03-24T18:53:58: 
 2025-03-24T18:53:58: > heiyan@1.0.0 start
 2025-03-24T18:53:58: > node tg_factory_main.js
 2025-03-24T18:53:58: 
+=======
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+2025-03-24T16:30:58: 
+2025-03-24T16:30:58: > heiyan@1.0.0 start
+2025-03-24T16:30:58: > node tg_factory_main.js
+2025-03-24T16:30:58: 
+2025-03-24T16:32:30: 
+2025-03-24T16:32:30: > heiyan@1.0.0 start
+2025-03-24T16:32:30: > node tg_factory_main.js
+2025-03-24T16:32:30: 
+2025-03-24T16:44:26: 
+2025-03-24T16:44:26: > heiyan@1.0.0 start
+2025-03-24T16:44:26: > node tg_factory_main.js
+2025-03-24T16:44:26: 
+=======
+2025-03-24T18:43:35: 
+2025-03-24T18:43:35: > heiyan@1.0.0 start
+2025-03-24T18:43:35: > node tg_factory_main.js
+2025-03-24T18:43:35: 
+2025-03-24T18:43:40: Connected to Redis
+2025-03-24T18:45:00: 
+2025-03-24T18:45:00: > heiyan@1.0.0 start
+2025-03-24T18:45:00: > node tg_factory_main.js
+2025-03-24T18:45:00: 
+2025-03-24T18:45:04: Connected to Redis
+>>>>>>> 1eb8cc4754906a72eaa3e6ed8b0bfdad8a0582d9
+>>>>>>> 9d2fb1f0d5245fd6162c29e15491100e3b50780b
+>>>>>>> 56ee8c7424952aef3f7381c17c1e522664c5b208

logs/out.log

@@ -1,4 +1,35 @@
+<<<<<<< HEAD
 2025-03-24T18:53:58: 
 2025-03-24T18:53:58: > heiyan@1.0.0 start
 2025-03-24T18:53:58: > node tg_factory_main.js
 2025-03-24T18:53:58: 
+=======
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+2025-03-24T16:30:58: 
+2025-03-24T16:30:58: > heiyan@1.0.0 start
+2025-03-24T16:30:58: > node tg_factory_main.js
+2025-03-24T16:30:58: 
+2025-03-24T16:32:30: 
+2025-03-24T16:32:30: > heiyan@1.0.0 start
+2025-03-24T16:32:30: > node tg_factory_main.js
+2025-03-24T16:32:30: 
+2025-03-24T16:44:26: 
+2025-03-24T16:44:26: > heiyan@1.0.0 start
+2025-03-24T16:44:26: > node tg_factory_main.js
+2025-03-24T16:44:26: 
+=======
+2025-03-24T18:43:35: 
+2025-03-24T18:43:35: > heiyan@1.0.0 start
+2025-03-24T18:43:35: > node tg_factory_main.js
+2025-03-24T18:43:35: 
+2025-03-24T18:43:40: Connected to Redis
+2025-03-24T18:45:00: 
+2025-03-24T18:45:00: > heiyan@1.0.0 start
+2025-03-24T18:45:00: > node tg_factory_main.js
+2025-03-24T18:45:00: 
+2025-03-24T18:45:04: Connected to Redis
+>>>>>>> 1eb8cc4754906a72eaa3e6ed8b0bfdad8a0582d9
+>>>>>>> 9d2fb1f0d5245fd6162c29e15491100e3b50780b
+>>>>>>> 56ee8c7424952aef3f7381c17c1e522664c5b208