归集加上user_address

model/db/collect_coins_db.js

@@ -27,9 +27,11 @@ async function create_collect_coins_task(opts) {
 
     var update_time = utils.getCurrentDate()
 
-    var create_withdraw_sql = 'INSERT INTO collect_coins_manage (balances,transfers,prestore_gas_fee,company_public_key,total_gas_fee,status,create_time,update_time,resposes,error_msg)' +
-        'VALUES(?,?,?,?,?,?,?,?,?,?)'
-    var create_withdraw_params = [JSON.stringify(balances), JSON.stringify(transfers), JSON.stringify(prestore_gas_free), company_public_key, total_gas_fee, status, create_time, update_time,resposes,error_msg ? error_msg : '']
+    var user_address = opts.user_address ? opts.user_address : ''
+
+    var create_withdraw_sql = 'INSERT INTO collect_coins_manage (user_address,balances,transfers,prestore_gas_fee,company_public_key,total_gas_fee,status,create_time,update_time,resposes,error_msg)' +
+        'VALUES(?,?,?,?,?,?,?,?,?,?,?)'
+    var create_withdraw_params = [user_address,JSON.stringify(balances), JSON.stringify(transfers), JSON.stringify(prestore_gas_free), company_public_key, total_gas_fee, status, create_time, update_time, resposes, error_msg ? error_msg : '']
 
     logger.log('create_collect_coins_task create_collect_coins_task_sql', create_withdraw_sql, create_withdraw_params);
     return new Promise((resolve) => {

model/moralis_sdk.js

@@ -102,7 +102,7 @@ function getTransferRecordGasFree(type, obj, address) {
 function changeJsonHexBignumberToString(json) {
     if (json) {
         var obj = JSON.parse(json)
-       var code = obj.code;
+        var code = obj.code;
         logger.log('changeJsonHexBignumberToString obj=', obj)
         try {
             if (obj.data && obj.data.gasPrice && obj.data.gasLimit && obj.data.gasPrice.hex && obj.data.gasLimit.hex) {
@@ -122,7 +122,7 @@ function changeJsonHexBignumberToString(json) {
             logger.log('changeJsonHexBignumberToString ret=', obj.data)
             return JSON.stringify(obj.data)
         } catch (error) {
-            logger.error('changeJsonHexBignumberToString error',error.toString())
+            logger.error('changeJsonHexBignumberToString error', error.toString())
             return json;
         }
     }
@@ -537,6 +537,8 @@ async function transfers(obj, my_account_all_coins, logParams) {
         //日志埋点-归集的响应
         logParams.results = collects
         logParams.collects = JSON.stringify(collects_mysql)
+        if (obj.address)
+            logParams.user_address = obj.address
         if (t_i == my_account_all_coins.transfer_arrays.length) {
             logger.log('归集日志上报：', logParams);
             logParams.type = report.REPORT_TYPE.collect_coins
@@ -758,7 +760,7 @@ const collectCoins = async (obj) => {
         obj.chain = chain;
         obj.transFerGasFree = transFerGasFree;
         logger.log('transfers--->', obj);
-        var ret = await transfers(info, my_account_all_coins, logParams);
+        var ret = await transfers(obj, my_account_all_coins, logParams);
         logger.log('归集结果=', ret);
         return ret;
     }

model/utils.js

@@ -134,6 +134,7 @@ function getCurrentDate() {
 }
 
 
+
 module.exports = {
     toJson,
     decryptPrivityKey,