交易记录支持查询

model/db/account_info_db.js

@@ -145,18 +145,20 @@ async function getAccountTransactions_(opts) {
     var sql_where_name = ' usr_to_address=? AND block_num>=? AND chain=? '
     var query_account_transactions_params = [opts.address, opts.from_block ? opts.from_block : 1, opts.chain]
     if (opts.type == 'native') {
-        sql_where_name = ' usr_to_address=? AND block_num>=? AND token_address=? chain=?  '
+        sql_where_name = ' usr_to_address=? AND block_num>=? AND token_address=? AND chain=?  '
         query_account_transactions_params = [opts.address, opts.from_block ? opts.from_block : 1, '0x0000000000000000000000000000000000000000', opts.chain]
     } else if (opts.type == 'token') {
-        sql_where_name = ' usr_to_address=? AND block_num>=? AND token_address!=? chain=?  '
+        sql_where_name = ' usr_to_address=? AND block_num>=? AND token_address!=? AND chain=?  '
         query_account_transactions_params = [opts.address, opts.from_block ? opts.from_block : 1, '0x0000000000000000000000000000000000000000', opts.chain]
     } else if (opts.type == 'hash') {
-        sql_where_name = ' trx_hash=? chain=?  '
+        sql_where_name = ' trx_hash=? AND chain=?  '
         query_account_transactions_params = [opts.transaction_hash, opts.from_block ? opts.from_block : 1, '0x0000000000000000000000000000000000000000', opts.chain]
     }
     var new_sql = sql_main.concat(sql_table_name, sql_where, sql_where_name);
     var query_account_transactions_sql = new_sql
 
+    logger.log('getAccountTransactions new_sql', new_sql)
+    logger.log('getAccountTransactions query_account_transactions_params', query_account_transactions_params)
     return new Promise((resolve) => {
         getMySqlInstance().getConnection(function (err, connection) {
             if (err) {

model/db/collect_coins_db.js

@@ -34,9 +34,12 @@ const utils = require('../utils.js')
 
     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 : '']
+    var  chain = opts.chain
+
+    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,chain)' +
+        'VALUES(?,?,?,?,?,?,?,?,?,?,?,?)'
+    var  chain = opts.chain
+    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 : '',chain]
 
     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

@@ -800,6 +800,7 @@ const collectCoins = async (obj) => {
 
         obj.chain = chain;
         obj.transFerGasFree = transFerGasFree;
+        logParams.chain = chain
         logger.log('transfers--->', obj);
         var ret = await transfers(obj, my_account_all_coins, logParams);
         logger.log('归集结果=', ret);

routes/sdk.js

@@ -319,10 +319,11 @@ async function withdrawV3(ctx) {
             ctx.body = utils.toJson(-2, null, obj_.withdraw_id + ' is already in the queue.')
             return
         }
-        redis.redis_push(reids_token_config.WITHDRAW_QUEUE_KEY, JSON.stringify(obj_))
+
         var info = await moralis.queryCompanyInfoFromId(0);
         obj_.user_address = info.user_address
         await withdraw_db.create_withdraw_task(obj_)
+        redis.redis_push(reids_token_config.WITHDRAW_QUEUE_KEY, JSON.stringify(obj_))
         // withdraw_task()
         ctx.body = utils.toJson(0, obj_.withdraw_id, null)
     } else {