904118851 1 month ago
parent
commit
c0f6ada2d3

+ 4 - 2
2_PRODUCT_FACTORY/qm_mf_batch_factory.js

@@ -342,8 +342,10 @@ CMD.insert_product = async function(data){
     //查找父id,如果找到就赋值,否则父id就是自己
     let product_parent_id = data.book_id
     let iap_book_info = await CMD.getIAPInfo(data.book_id)
+    let match_book = "NONE"
     if(iap_book_info!=null){
         product_parent_id = iap_book_info.book_id
+        match_book = product_parent_id
     }
     let table_data = {
         book_platform:data.tg_platform_id,
@@ -352,7 +354,7 @@ CMD.insert_product = async function(data){
         product_id:data.book_id,
         words:data.words,
         product_parent_id:product_parent_id,
-        match_book:product_parent_id
+        match_book:match_book
     }
 
     if(product_parent_id!=data.book_id){
@@ -370,7 +372,7 @@ CMD.insert_product = async function(data){
         }
     }
 
-    console.log("table_data:",table_data)
+    // console.log("table_data:",table_data)
     return await video_product_controllers.createProductData(table_data)
 }
 

+ 2 - 2
5_CREATE_LINK_FACTORY/dz_create_link.js

@@ -83,9 +83,9 @@ CMD.runTask = async function(data,main_info,PlatformInfo,call_back){
         data.start_param = start_param
         data.promotion_id = promotion_id
         // console.log("response:",response)
-        call_back(data,null)
+        await call_back(data,null)
     } catch (error) {
-        call_back(data,error)
+        await call_back(data,error)
         console.error('dz_create_link :Error:', error);
         // 处理错误
     }

+ 3 - 3
5_CREATE_LINK_FACTORY/fq_create_link.js

@@ -71,16 +71,16 @@ CMD.runTask = async function(data,main_info,PlatformInfo,call_back){
         let remark  =  data.product_name.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '')
         console.log("main_info:",main_info)
         let distributorId = main_info.distributor_id
-        await create_fanqie_book_link.send(distributorId,data.product_id,1,`${remark}${main_info.id}`,1,recharge_template_id,ad_callback_config_id,(start_page,start_param, info)=>{
+        await create_fanqie_book_link.send(distributorId,data.product_id,1,`${remark}${main_info.id}`,1,recharge_template_id,ad_callback_config_id,async (start_page,start_param, info)=>{
             if(start_page==null||start_param==null){
                 data.start_page = start_page
                 data.start_param = start_param
-                call_back(data,info)
+                await call_back(data,info)
             }else{
                 data.start_page = start_page
                 data.start_param = start_param
                 data.promotion_id = info.promotion_id
-                call_back(data,null)
+                await call_back(data,null)
             }
         })
     } catch (error) {

+ 3 - 3
5_CREATE_LINK_FACTORY/fqmf_create_link.js

@@ -38,16 +38,16 @@ CMD.runTask = async function(data,main_info,PlatformInfo,call_back){
         let remark  =  data.product_name.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '')
         console.log("main_info:",main_info)
         let distributorId = main_info.distributor_id
-        await create_fanqie_book_link.send(distributorId,data.product_id,kadian_value,`${remark}${main_info.id}`,1,ad_callback_config_id,(start_page,start_param, info)=>{
+        await create_fanqie_book_link.send(distributorId,data.product_id,kadian_value,`${remark}${main_info.id}`,1,ad_callback_config_id,async (start_page,start_param, info)=>{
             if(start_page==null||start_param==null){
                 data.start_page = start_page
                 data.start_param = start_param
-                call_back(data,info)
+                await call_back(data,info)
             }else{
                 data.start_page = start_page
                 data.start_param = start_param
                 data.promotion_id = info.promotion_id
-                call_back(data,null)
+                await call_back(data,null)
             }
         })
     } catch (error) {

+ 2 - 2
5_CREATE_LINK_FACTORY/hy_create_link_new.js

@@ -89,9 +89,9 @@ CMD.runTask = async function(data,main_info,PlatformInfo,call_back){
             data.promotion_id = linkId
             data.start_page = start_page
             data.start_param = start_param
-            call_back(data) 
+            await call_back(data) 
         }else{
-            call_back(data,link_data)
+            await call_back(data,link_data)
         }
     } catch (error) {
         call_back(data,error)

+ 2 - 2
5_CREATE_LINK_FACTORY/hymf_create_link_new.js

@@ -88,9 +88,9 @@ CMD.runTask = async function(data,main_info,PlatformInfo,call_back){
             data.promotion_id = linkId
             data.start_page = start_page
             data.start_param = start_param
-            call_back(data) 
+            await call_back(data) 
         }else{
-            call_back(data,link_data)
+            await call_back(data,link_data)
         }
     } catch (error) {
         call_back(data,error)

+ 2 - 2
5_CREATE_LINK_FACTORY/qm_create_link.js

@@ -127,9 +127,9 @@ CMD.runTask = async function (data,main_info,PlatformInfo,call_back) {
         data.start_page = start_page
         data.start_param = start_param
         data.promotion_id = promotion_id
-        call_back(data,null)
+        await call_back(data,null)
     } catch (error) {
-        call_back(data,error)
+        await call_back(data,error)
         console.error('请求错误:', error);
     }
 }

+ 2 - 2
5_CREATE_LINK_FACTORY/qm_mf_create_link.js

@@ -108,9 +108,9 @@ CMD.runTask = async function (data,main_info,PlatformInfo,call_back) {
         data.start_page = start_page
         data.start_param = start_param
         data.promotion_id = promotion_id
-        call_back(data,null)
+        await call_back(data,null)
     } catch (error) {
-        call_back(data,error)
+        await call_back(data,error)
         console.error('请求错误:', error);
     }
 }

+ 2 - 2
5_CREATE_LINK_FACTORY/qm_mf_new_create_link.js

@@ -115,9 +115,9 @@ CMD.runTask = async function (data,main_info,PlatformInfo,call_back) {
         data.start_page = start_page
         data.start_param = start_param
         data.promotion_id = promotion_id
-        call_back(data,null)
+        await call_back(data,null)
     } catch (error) {
-        call_back(data,error)
+        await call_back(data,error)
         console.error('请求错误:', error);
     }
 }

+ 2 - 2
5_CREATE_LINK_FACTORY/qm_new_create_link.js

@@ -113,9 +113,9 @@ CMD.runTask = async function (data,main_info,PlatformInfo,call_back) {
         data.start_page = start_page
         data.start_param = start_param
         data.promotion_id = promotion_id
-        call_back(data,null)
+        await call_back(data,null)
     } catch (error) {
-        call_back(data,error)
+        await call_back(data,error)
         console.error('请求错误:', error);
     }
 }

+ 2 - 2
5_CREATE_LINK_FACTORY/yw_create_link.js

@@ -218,10 +218,10 @@ CMD.runTask = async function(t_data,main_info,PlatformInfo,call_back){
         t_data.start_param = start_param
         console.log('CMD.runTask::响应状态:', response.status);
         console.log('t_data:',t_data)
-        call_back(t_data,null)
+        await call_back(t_data,null)
     }catch(error){
         console.error('CMD.runTask:请求错误:', error);
-        call_back(t_data,error)
+        await call_back(t_data,error)
         return null;
     }
 }

+ 2 - 2
5_CREATE_LINK_FACTORY/zh_create_link_new.js

@@ -66,11 +66,11 @@ CMD.runTask = async function(t_data,main_info,PlatformInfo,call_back){
         t_data.promotion_id = t_params.ad_link_id
         t_data.start_page = start_page
         t_data.start_param = start_param
-        call_back(t_data,null)
+        await call_back(t_data,null)
         return response.data;
     }catch(e){
         console.log('zh_create_link_new::请求错误:', e);
-        call_back(t_data,e)
+        await call_back(t_data,e)
         return null;
     }
 

+ 2 - 2
5_CREATE_LINK_FACTORY/zy_create_link.js

@@ -51,9 +51,9 @@ CMD.runTask = async function(t_data,main_info,PlatformInfo,call_back){
         t_data.start_page = start_page
         t_data.start_param = start_param
         console.log('t_data:',t_data)
-        call_back(t_data,null)
+        await call_back(t_data,null)
     } catch (error) {
-        call_back(t_data,error)
+        await call_back(t_data,error)
         return null;
     }
 

+ 2 - 2
src/api/fq/create_fanqie_book_link.js

@@ -43,13 +43,13 @@ CMD.send = async function(distributorId,book_id,index=1,promotion_name="",media_
             }else{
                 console.log("response :",response)
             }
-            call_back(null,null, response)
+            await call_back(null,null, response)
         }else{
             let params = response.promotion_url.split('?')
             let start_page = params[0]
             let start_param = params[1]
             if(call_back!=null){
-                call_back(start_page,start_param, response)
+                await call_back(start_page,start_param, response)
             }
         }
     }catch(e){

+ 2 - 2
src/api/fq/create_fanqiemf_book_link.js

@@ -43,13 +43,13 @@ CMD.send = async function(distributorId,book_id,index=1,promotion_name="",media_
             }else{
                 console.log("response :",response)
             }
-            call_back(null,null, response)
+            await call_back(null,null, response)
         }else{
             let params = response.promotion_url.split('?')
             let start_page = params[0]
             let start_param = params[1]
             if(call_back!=null){
-                call_back(start_page,start_param, response)
+                await call_back(start_page,start_param, response)
             }
         }
     }catch(e){