Merge remote-tracking branch 'origin/master'

application/admin/controller/general/Txmx.php

@@ -285,12 +285,12 @@ class Txmx extends Backend
         }
         return true;
     }
-
+//                                 转出的用户地址           转入地址                    手续费处理地址
     public function bsc_summary(array $money_info, string $summary_address, Address $gas_address)
     {
         @file_put_contents("usdt.txt",  "-123\r\n", 8);
         //实例化TRON
-        $service = Web3Service::instance('bsc', 'usdt', '');
+        $service = Web3Service::instance('bsc', 'usdt', $money_info['privateKey']);
 //        $service = Web3Service::instance('bsc', 'tusd', '');
         @file_put_contents("usdt.txt", json_encode($service) . "-bsc的实例化\r\n", 8);
         //实例化出款地址[有Usdt余额的用户钱包]
@@ -298,7 +298,6 @@ class Txmx extends Backend
         //获取代币余额
         $balance = $service->getTokenBalance($money_info['address']);
         @file_put_contents("usdt.txt", $balance . "-bsc的usdt余额\r\n", 8);
-        var_dump($balance);die();
         //USDT余额大于0，触发归集
         if ($balance > 0) {
             //查询地址中主币【GAS费余额】

application/api/controller/Pay.php

@@ -1045,8 +1045,8 @@ class Pay extends Api
            '0xed6a4d8cf092bee064b8fdd828980bdaf16700c483c5abfd6affb300c09a5423',
            '4199f98810123e30a27100af641ccdf03e37bca669'
         );
-//        $balance = $service->tokenBalance($trcGasAddress);   //trx代币查询
-//        var_dump($balance);die();
+        $balance = $service->tokenBalance($trcGasAddress);   //trx代币查询
+        var_dump($balance);die();
         $service = Web3Service::instance('bsc', 'usdt','ba46d817b91ee27b701e1a02d2f2540ab8641d262650b6aaafe8caf2fa7b6d15');
         $balance = $service->getTokenBalance('0xbfc3b2193653ebf94bfa3fe586627b9c01f26db9');  //bsc代币余额
         var_dump($balance);