904118851 1 сар өмнө
parent
commit
d96a1c505a

+ 34 - 14
0_RECEIVE_FACTORY/RECEIVE_FACTORY.js

@@ -316,22 +316,40 @@ CMD.get_dz_book = async function(book_id,res) {
     console.log('get_dz_book:', data);
 }
 
-CMD.get_dz_callback_template = async function(channelId,res) {
+CMD.get_dz_callback_template = async function(isFree,channelId,res) {
     console.log("get_dz_callback_template!")
-    require('../src/api/dz/get_dz_call_back_template').get_callback_template(channelId,(data)=>{
-        console.log('get_dz_callback_template:', data);
-        res.writeHead(200, {'Content-Type': 'application/json'});
-        res.end(JSON.stringify({ message:"成功!",data:data,code:10000}));
-    })
+    if(isFree==1){
+        require('../src/api/dz/get_dz_call_back_template').get_mf_callback_template(channelId,(data)=>{
+            console.log('get_dz_callback_template:', data);
+            res.writeHead(200, {'Content-Type': 'application/json'});
+            res.end(JSON.stringify({ message:"成功!",data:data,code:10000}));
+        })
+    }else{
+        require('../src/api/dz/get_dz_call_back_template').get_callback_template(channelId,(data)=>{
+            console.log('get_dz_callback_template:', data);
+            res.writeHead(200, {'Content-Type': 'application/json'});
+            res.end(JSON.stringify({ message:"成功!",data:data,code:10000}));
+        })
+    }
+
 }
 
-CMD.get_dz_channel_Info_list = async function(is_wx,res) {
+CMD.get_dz_channel_Info_list = async function(isFree,is_wx,res) {
     console.log("get_dz_channel_Info_list!")
-    require('../src/api/dz/get_channel_Info_list').get_channel_Info_list(is_wx,(data)=>{
-        console.log('get_dz_channel_Info_list:', data);
-        res.writeHead(200, {'Content-Type': 'application/json'});
-        res.end(JSON.stringify({ message:"成功!",data:data,code:10000}));
-    })
+    if(isFree==1){
+        require('../src/api/dz/get_channel_Info_list').get_mf_channel_Info_list(is_wx,(data)=>{
+            console.log('get_dz_channel_Info_list:', data);
+            res.writeHead(200, {'Content-Type': 'application/json'});
+            res.end(JSON.stringify({ message:"成功!",data:data,code:10000}));
+        })
+    }else{
+        require('../src/api/dz/get_channel_Info_list').get_channel_Info_list(is_wx,(data)=>{
+            console.log('get_dz_channel_Info_list:', data);
+            res.writeHead(200, {'Content-Type': 'application/json'});
+            res.end(JSON.stringify({ message:"成功!",data:data,code:10000}));
+        })
+    }
+
 }
 
 CMD.get_dz_recharge_template = async function(channelId,res) {
@@ -670,13 +688,15 @@ var server = http.createServer(function(req,res){
                         CMD.get_dz_book(book_id,res) 
                     }else if(jsonData['fun']=="get_dz_callback_template"&&jsonData['cmd']=="dz_link"){
                         let channelId = jsonData['data']['channelId']
-                        CMD.get_dz_callback_template(channelId,res) 
+                        let isFree = jsonData['data']['isFree']
+                        CMD.get_dz_callback_template(isFree,channelId,res) 
                     }else if(jsonData['fun']=="get_dz_recharge_template"&&jsonData['cmd']=="dz_link"){
                         let channelId = jsonData['data']['channelId']
                         CMD.get_dz_recharge_template(channelId,res) 
                     }else if(jsonData['fun']=="get_dz_channel_Info_list"&&jsonData['cmd']=="dz_link"){
                         let is_wx = jsonData['data']['is_wx']
-                        CMD.get_dz_channel_Info_list(is_wx,res) 
+                        let isFree = jsonData['data']['isFree']
+                        CMD.get_dz_channel_Info_list(isFree,is_wx,res) 
                     }else if(jsonData['fun']=="get_qm_recharge_template"&&jsonData['cmd']=="qm_link"){
                         let category = jsonData['data']['category']
                         let qm_id = jsonData['data']['qm_id']

+ 25 - 19
5_CREATE_LINK_FACTORY/dz_create_link.js

@@ -9,8 +9,8 @@ CMD.runTask = async function(data,main_info,PlatformInfo,call_back){
     let tg_link_config = JSON.parse(main_info.tg_link_config)
     let chongzhi_id = tg_link_config['chongzhi_id']
     let huichuan_id = tg_link_config['huichuan_id']
-    let chongzhi_list = JSON.parse(PlatformInfo.chongzhi)
-    let huichuan_list = JSON.parse(PlatformInfo.huichuan)
+    // let chongzhi_list = JSON.parse(PlatformInfo.chongzhi)
+    // let huichuan_list = JSON.parse(PlatformInfo.huichuan)
     let recharge_template_id = ""
     let call_back_template_id = ""
     let timestamp = helper.getCurrentUnixTimestamp()
@@ -20,27 +20,33 @@ CMD.runTask = async function(data,main_info,PlatformInfo,call_back){
         clientId = config.dianzhong_channel_config.clientId
         token = config.dianzhong_channel_config.token
     }else if(PlatformInfo.mini_program_platform_id==config.dy){
-        clientId = config.dianzhong_config.clientId
-        token = config.dianzhong_config.token
-    }
-
-    let signKey = helper.md5(clientId+token+timestamp)
-    for (let index = 0; index < chongzhi_list.length; index++) {
-        const cz_obj = chongzhi_list[index];
-        if(cz_obj.id==chongzhi_id){
-          recharge_template_id = cz_obj.value
-          break
+        if(main_info.pay_type==0){
+            clientId = config.dianzhong_mf_channel_config.clientId
+            token = config.dianzhong_mf_channel_config.token
+        }else{
+            clientId = config.dianzhong_config.clientId
+            token = config.dianzhong_config.token
         }
     }
 
-    for (let index = 0; index < huichuan_list.length; index++) {
-        const hc_obj = huichuan_list[index];
-        if(hc_obj.id==huichuan_id){
-          call_back_template_id = hc_obj.value
-          break
-        }
-      }
+    let signKey = helper.md5(clientId+token+timestamp)
+    // for (let index = 0; index < chongzhi_list.length; index++) {
+    //     const cz_obj = chongzhi_list[index];
+    //     if(cz_obj.id==chongzhi_id){
+    //       recharge_template_id = cz_obj.value
+    //       break
+    //     }
+    // }
+    recharge_template_id = chongzhi_id
+    // for (let index = 0; index < huichuan_list.length; index++) {
+    //     const hc_obj = huichuan_list[index];
+    //     if(hc_obj.id==huichuan_id){
+    //       call_back_template_id = hc_obj.value
+    //       break
+    //     }
+    //   }
 
+    call_back_template_id = huichuan_id
     try {
         let client = new HttpClient()
         let bookId = data.product_id;

BIN
dump.rdb


+ 6 - 0
etc/config.json

@@ -57,6 +57,12 @@
         "channelInfoList": "https://routine.wqxsw.com/flames/channel/query/channelInfoList",
         "channelId":"63010"
     },
+    "dianzhong_mf_channel_config": {
+        "clientId": 10009705,
+        "token":"s89Ex41jz4tT3GBEEP",
+        "channelInfoList": "https://routine.wqxsw.com/flames/channel/query/channelInfoList",
+        "channelId":"63010"
+    },
     "qimao_config":{
         "admin_account_name":"zhuoyue",
         "access_key":"09ba094d2f70e0e5bc340cca365fabe3",

+ 24 - 0
src/api/dz/get_channel_Info_list.js

@@ -26,4 +26,28 @@ CMD.get_channel_Info_list = async function(is_wx,call_back){
     }
     call_back(response)
 }
+
+// 免费渠道列表查询接口(新)
+CMD.get_mf_channel_Info_list = async function(is_wx,call_back){
+    let clinet = new HttpClient()
+    let timestamp = Date.now()
+    let response = null
+    let signKey  = null
+    if(is_wx){
+        // signKey = helper.md5(config.dianzhong_mf_channel_config.clientId+config.dianzhong_mf_channel_config.token+timestamp)
+        // response = await clinet.post(config.dianzhong_mf_channel_config.channelInfoList,{
+        //     clientId:config.dianzhong_mf_channel_config.clientId,
+        //     timestamp:timestamp,
+        //     signKey:signKey
+        // })
+    }else{
+        signKey = helper.md5(config.dianzhong_mf_channel_config.clientId+config.dianzhong_mf_channel_config.token+timestamp)
+        response = await clinet.post(config.dianzhong_mf_channel_config.channelInfoList,{
+            clientId:config.dianzhong_mf_channel_config.clientId,
+            timestamp:timestamp,
+            signKey:signKey
+        })
+    }
+    call_back(response)
+}
 module.exports = CMD;

+ 15 - 0
src/api/dz/get_dz_call_back_template.js

@@ -17,4 +17,19 @@ CMD.get_callback_template = async function(channelId,call_back){
     })
     call_back(response)
 }
+
+// 获取点众免费回传模板
+CMD.get_mf_callback_template = async function(channelId,call_back){
+    let clinet = new HttpClient()
+    let timestamp = helper.getCurrentUnixTimestamp()
+    let signKey = helper.md5(config.dianzhong_mf_channel_config.clientId+config.dianzhong_mf_channel_config.token+timestamp)
+    let response = await clinet.post(config.dianzhong_config.callbacklist_hots,{
+        channelId:channelId,
+        clientId:config.dianzhong_mf_channel_config.clientId,
+        timestamp:timestamp,
+        type:config.dianzhong_config.type,
+        signKey:signKey
+    })
+    call_back(response)
+}
 module.exports = CMD;

BIN
src/api/hy/qr.gif


BIN
src/api/hy/qr_resized.gif