904118851 4 месяцев назад
Родитель
Сommit
763d8fbb3a

+ 12 - 3
5_CREATE_LINK_FACTORY/hy_create_link_factory.js

@@ -159,9 +159,18 @@ async function processCreateLinkTask(){
     try{
         if(hy_create_link_task_list.length>0){
             let hy_create_link_task = hy_create_link_task_list.pop()
-            require('./hy_create_link_new').runTask(hy_create_link_task.n_data
-                ,hy_create_link_task.main_info,
-                hy_create_link_task.PlatformInfo,finish_call_back)
+            if(hy_create_link_task.main_info.pay_type==0){
+                let PlatformConfig = await redis_help.getKeyValue("PlatformConfig")
+                PlatformConfig = JSON.parse(PlatformConfig)
+                await require('./hymf_create_link_new').runTask(hy_create_link_task.n_data
+                    ,hy_create_link_task.main_info,
+                    CMD.getPlatformInfoById(PlatformConfig,config.platform_heiyanmf),finish_call_back)
+            }else{
+                await require('./hy_create_link_new').runTask(hy_create_link_task.n_data
+                    ,hy_create_link_task.main_info,
+                    hy_create_link_task.PlatformInfo,finish_call_back)
+            }
+  
         }
         await new Promise(resolve => setTimeout(resolve,100));
     }catch(e){

+ 1 - 1
5_CREATE_LINK_FACTORY/qm_create_link_factory.js

@@ -146,7 +146,7 @@ async function processTask(){
         console.log("qm_create_link_task_list:",qm_create_link_task_list)
         if(qm_create_link_task_list.length>0){
             let qm_create_link_task = qm_create_link_task_list.pop()
-            require('./qm_create_link').runTask(qm_create_link_task.n_data
+            await require('./qm_create_link').runTask(qm_create_link_task.n_data
                 ,qm_create_link_task.main_info,
                 qm_create_link_task.PlatformInfo,finish_call_back)
             // require('./qm_new_create_link').runTask(qm_create_link_task.n_data

+ 25 - 42
logs/combined.log

@@ -1,42 +1,25 @@
-<<<<<<< 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
+2025-04-01T19:46:08: 
+2025-04-01T19:46:08: > heiyan@1.0.0 start
+2025-04-01T19:46:08: > node tg_factory_main.js
+2025-04-01T19:46:08: 
+2025-04-01T19:46:12: Connected to Redis
+2025-04-01T19:50:52: 
+2025-04-01T19:50:52: > heiyan@1.0.0 start
+2025-04-01T19:50:52: > node tg_factory_main.js
+2025-04-01T19:50:52: 
+2025-04-01T19:50:56: Connected to Redis
+2025-04-01T20:02:48: 
+2025-04-01T20:02:48: > heiyan@1.0.0 start
+2025-04-01T20:02:48: > node tg_factory_main.js
+2025-04-01T20:02:48: 
+2025-04-01T20:02:52: Connected to Redis
+2025-04-01T20:08:06: 
+2025-04-01T20:08:06: > heiyan@1.0.0 start
+2025-04-01T20:08:06: > node tg_factory_main.js
+2025-04-01T20:08:06: 
+2025-04-01T20:08:11: Connected to Redis
+2025-04-01T20:11:28: 
+2025-04-01T20:11:28: > heiyan@1.0.0 start
+2025-04-01T20:11:28: > node tg_factory_main.js
+2025-04-01T20:11:28: 
+2025-04-01T20:11:32: Connected to Redis

+ 25 - 42
logs/out.log

@@ -1,42 +1,25 @@
-<<<<<<< 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
+2025-04-01T19:46:08: 
+2025-04-01T19:46:08: > heiyan@1.0.0 start
+2025-04-01T19:46:08: > node tg_factory_main.js
+2025-04-01T19:46:08: 
+2025-04-01T19:46:12: Connected to Redis
+2025-04-01T19:50:52: 
+2025-04-01T19:50:52: > heiyan@1.0.0 start
+2025-04-01T19:50:52: > node tg_factory_main.js
+2025-04-01T19:50:52: 
+2025-04-01T19:50:56: Connected to Redis
+2025-04-01T20:02:48: 
+2025-04-01T20:02:48: > heiyan@1.0.0 start
+2025-04-01T20:02:48: > node tg_factory_main.js
+2025-04-01T20:02:48: 
+2025-04-01T20:02:52: Connected to Redis
+2025-04-01T20:08:06: 
+2025-04-01T20:08:06: > heiyan@1.0.0 start
+2025-04-01T20:08:06: > node tg_factory_main.js
+2025-04-01T20:08:06: 
+2025-04-01T20:08:11: Connected to Redis
+2025-04-01T20:11:28: 
+2025-04-01T20:11:28: > heiyan@1.0.0 start
+2025-04-01T20:11:28: > node tg_factory_main.js
+2025-04-01T20:11:28: 
+2025-04-01T20:11:32: Connected to Redis

BIN
src/api/hy/qr.gif


BIN
src/api/hy/qr_resized.gif