904118851 há 4 meses atrás
pai
commit
ec705c0b9a

+ 18 - 2
2_PRODUCT_FACTORY/hy_batch_factory.js

@@ -386,6 +386,8 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                                         table_data.book_platform = config.platform_heiyanmf
                                         table_data.product_parent_id =  await CMD.get_product_parent_id(data.book_id)
                                     }
+
+
                                     console.log("table_data:",table_data)
                                     //没有找到 可以创建
                                     await video_applet_product_controllers.createAppletProductData(table_data)
@@ -441,12 +443,26 @@ CMD.get_product_parent_id = async function(product_id) {
 }
 
 CMD.insert_product = async function(data){
-    return await video_product_controllers.createProductData({
+    let product_parent_id =  await CMD.get_product_parent_id(data.book_id)
+    //寻找父id的书
+    let product_info = await video_product_controllers.getProductData({book_id:product_parent_id}); 
+    if(!product_info.success){//如果没有这本付费的书
+        await video_product_controllers.createProductData({
+            book_platform:config.platform_heiyan,
+            product_name:data.book_name.substring(0, data.book_name.length - 4),
+            genre:data.genre,
+            product_id:product_parent_id,
+            words:data.words
+        })
+    }
+
+    await video_product_controllers.createProductData({
         book_platform:data.tg_platform_id,
         product_name:data.book_name,
         genre:data.genre,
         product_id:data.book_id,
-        words:data.words
+        words:data.words,
+        product_parent_id:product_parent_id
     })
 }
 

+ 17 - 1
2_PRODUCT_FACTORY/qm_mf_batch_factory.js

@@ -295,6 +295,7 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                             if(butler_video_applet_info==null){
                                 const result = await video_applet_product_controllers.getAppletProductData({book_id:data.book_id,main_id:data.main_id})
                                 if(!result.success){
+                                    let product_parent_id  =  await CMD.get_product_parent_id(data.book_id)
                                     //没有找到 可以创建
                                     await video_applet_product_controllers.createAppletProductData({
                                         book_platform:config.platform_qmmf,
@@ -309,7 +310,7 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                                         wait_status:0,
                                         material_platform_id:material_platform_id,
                                         butler_id:butler_id,
-                                        product_parent_id: await CMD.get_product_parent_id(data.book_id)
+                                        product_parent_id: product_parent_id
                                     })
                                 }
                             }
@@ -356,6 +357,21 @@ CMD.insert_product = async function(data){
         words:data.words,
         product_parent_id:product_parent_id
     }
+
+    if(product_parent_id!=data.book_id){
+        //寻找父id的书
+        let product_info = await video_product_controllers.getProductData({book_id:product_parent_id}); 
+        if(!product_info.success){//如果没有这本付费的书
+            await video_product_controllers.createProductData({
+                book_platform:config.platform_qimao,
+                product_name:data.book_name,
+                genre:data.genre,
+                product_id:product_parent_id,
+                words:data.words
+            })
+        }
+    }
+
     console.log("table_data:",table_data)
     return await video_product_controllers.createProductData(table_data)
 }

+ 45 - 0
logs/combined.log

@@ -1,4 +1,49 @@
+<<<<<<< HEAD
 2025-04-01T12:31:54: 
 2025-04-01T12:31:54: > heiyan@1.0.0 start
 2025-04-01T12:31:54: > node tg_factory_main.js
 2025-04-01T12:31:54: 
+=======
+<<<<<<< HEAD
+2025-03-31T18:47:31: 
+2025-03-31T18:47:31: > heiyan@1.0.0 start
+2025-03-31T18:47:31: > node tg_factory_main.js
+2025-03-31T18:47:31: 
+=======
+<<<<<<< HEAD
+2025-04-01T12:07:31: 
+2025-04-01T12:07:31: > heiyan@1.0.0 start
+2025-04-01T12:07:31: > node tg_factory_main.js
+2025-04-01T12:07:31: 
+2025-04-01T12:07:36: Connected to Redis
+=======
+2025-03-31T18:45:09: 
+2025-03-31T18:45:09: > heiyan@1.0.0 start
+2025-03-31T18:45:09: > node tg_factory_main.js
+2025-03-31T18:45:09: 
+>>>>>>> 6da56973c02dbd310b4a46ee7e9dc05ec52361fd
+<<<<<<< HEAD
+2025-04-01T16:07:58: 
+2025-04-01T16:07:58: > heiyan@1.0.0 start
+2025-04-01T16:07:58: > node tg_factory_main.js
+2025-04-01T16:07:58: 
+2025-04-01T16:08:28: Connected to Redis
+2025-04-01T16:08:51: 
+2025-04-01T16:08:51: > heiyan@1.0.0 start
+2025-04-01T16:08:51: > node tg_factory_main.js
+2025-04-01T16:08:51: 
+2025-04-01T16:08:56: Connected to Redis
+2025-04-01T16:30:09: 
+2025-04-01T16:30:09: > heiyan@1.0.0 start
+2025-04-01T16:30:09: > node tg_factory_main.js
+2025-04-01T16:30:09: 
+2025-04-01T16:30:13: Connected to Redis
+2025-04-01T16:43:39: 
+2025-04-01T16:43:39: > heiyan@1.0.0 start
+2025-04-01T16:43:39: > node tg_factory_main.js
+2025-04-01T16:43:39: 
+2025-04-01T16:43:43: Connected to Redis
+=======
+>>>>>>> c216686b3b1856135976414e6ad0541a7079584f
+>>>>>>> 5491a80d9b7e1dcea0e9052510698793ad6e784e
+>>>>>>> 0280b3f3f0d4ca48b3e2a028d936d1f4cf9340e1

+ 45 - 0
logs/out.log

@@ -1,4 +1,49 @@
+<<<<<<< HEAD
 2025-04-01T12:31:54: 
 2025-04-01T12:31:54: > heiyan@1.0.0 start
 2025-04-01T12:31:54: > node tg_factory_main.js
 2025-04-01T12:31:54: 
+=======
+<<<<<<< HEAD
+2025-03-31T18:47:31: 
+2025-03-31T18:47:31: > heiyan@1.0.0 start
+2025-03-31T18:47:31: > node tg_factory_main.js
+2025-03-31T18:47:31: 
+=======
+<<<<<<< HEAD
+2025-04-01T12:07:31: 
+2025-04-01T12:07:31: > heiyan@1.0.0 start
+2025-04-01T12:07:31: > node tg_factory_main.js
+2025-04-01T12:07:31: 
+2025-04-01T12:07:36: Connected to Redis
+=======
+2025-03-31T18:45:09: 
+2025-03-31T18:45:09: > heiyan@1.0.0 start
+2025-03-31T18:45:09: > node tg_factory_main.js
+2025-03-31T18:45:09: 
+>>>>>>> 6da56973c02dbd310b4a46ee7e9dc05ec52361fd
+<<<<<<< HEAD
+2025-04-01T16:07:58: 
+2025-04-01T16:07:58: > heiyan@1.0.0 start
+2025-04-01T16:07:58: > node tg_factory_main.js
+2025-04-01T16:07:58: 
+2025-04-01T16:08:28: Connected to Redis
+2025-04-01T16:08:51: 
+2025-04-01T16:08:51: > heiyan@1.0.0 start
+2025-04-01T16:08:51: > node tg_factory_main.js
+2025-04-01T16:08:51: 
+2025-04-01T16:08:56: Connected to Redis
+2025-04-01T16:30:09: 
+2025-04-01T16:30:09: > heiyan@1.0.0 start
+2025-04-01T16:30:09: > node tg_factory_main.js
+2025-04-01T16:30:09: 
+2025-04-01T16:30:13: Connected to Redis
+2025-04-01T16:43:39: 
+2025-04-01T16:43:39: > heiyan@1.0.0 start
+2025-04-01T16:43:39: > node tg_factory_main.js
+2025-04-01T16:43:39: 
+2025-04-01T16:43:43: Connected to Redis
+=======
+>>>>>>> c216686b3b1856135976414e6ad0541a7079584f
+>>>>>>> 5491a80d9b7e1dcea0e9052510698793ad6e784e
+>>>>>>> 0280b3f3f0d4ca48b3e2a028d936d1f4cf9340e1

+ 2 - 1
task_script/async_filter_data.js

@@ -5,6 +5,7 @@ const dbConfig = config.isDebug?config.debug_mysql:config.release_mysql
 const taskdbConfig = config.isDebug?config.debug_task_mysql:config.release_task_mysql
 const redis_help = require('../src/use_redis');
 const filter_data_controllers = require('../src/data_manager/Controllers/filter_data_controllers');
+const helper = require("../src/helper");
 const CMD = {}
 async function processTask(){
     let right_status = true
@@ -36,7 +37,7 @@ async function processTask(){
             multipleStatements: true
         });
 
-        sql = `SELECT * FROM video_product WHERE product_id = "${filter_info.book_id}" AND book_platform = ${tg_platform_id} LIMIT 1`
+        sql = `SELECT * FROM video_product WHERE product_id = "${filter_info.book_id}" AND (book_platform = 1 OR book_platform = 18) LIMIT 1`
         
         const [row1] = await task_connection.execute(sql)