1

application/admin/controller/general/Txmx.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller\general;
 
 use app\admin\model\Admin;
+use app\api\controller\Pay;
 use app\common\controller\Backend;
 use app\common\model\GasLog;
 use blockchain\TronService;
@@ -172,15 +173,17 @@ class Txmx extends Backend
 //        );
         $site = config('site');
 //        $trcUsdtAddress = $site['trxdz']['trx_address'];
+        $trx_hex_address =  Pay::base58ToHex($site['trxdz']['trx地址']);  // 16进制地址
+        $trx_hex_gas_address =  Pay::base58ToHex($site['trxdz']['trx手续费账号地址']);  // 16进制地址
         $trcUsdtAddress = new Address(
             $site['trxdz']['trx地址'],
-            $site['trxdz']['trx16位地址'],
-            $site['trxdz']['trx密钥']
+            $site['trxdz']['trx密钥'],
+            $trx_hex_address
         );
         $trcGasAddress = new Address(
             $site['trxdz']['trx_gas_address'],
             $site['trxdz']['trx_gas_private_key'],
-            $site['trxdz']['trx_hex_gas_address']
+            $trx_hex_gas_address
         );
         $bscUsdtAddress = $site['bscdz']['bsc_address'];
         $bscGasAddress = new Address(
@@ -222,7 +225,7 @@ class Txmx extends Backend
         return json(['code' => 1, 'data' => '转账完成']);
     }
 
-//                                 转出的用户地址           转入地址                    手续费处理地址
+//                                 转出的用户地址           转入地址                    手续费账号地址
     public function trx_summary(array $money_info, Address $summary_address, Address $gas_address)
     {
         //实例化TRON
@@ -256,6 +259,18 @@ class Txmx extends Backend
                     //执行转账                 form          to
                     $res = $service->transfer($gas_address, $address, $trade_trx);
                     @file_put_contents("usdt.txt", json_encode($res) . "-转账TRX手续费\r\n", 8);
+                    if ($res['msg']=='success'){
+                        $tx_id = $res['data']->txID;
+                        $up = [
+                            'order_id' => $tx_id,
+                            'type' => 'trx',
+                            'is_gas' => 0,
+                            'from_address' => $gas_address->address,
+                            'to_address' => $address['address'],
+                            'createtime' => time(),
+                        ];
+                        $id = Db::name('summary_log')->insertGetId($up);
+                    }
                     GasLog::create(['to_address' => $address, 'num' => $trade_trx, 'type' => 'trx']);
                     if (isset($res->txID)) {
                         Log::error('转账TRX交易哈希：' . $res->txID);
@@ -275,6 +290,18 @@ class Txmx extends Backend
                     $res = $service->tokenTransfer($address, $summary_address, $balance);
                     @file_put_contents("usdt.txt", json_encode($res) . "-转账usdt\r\n", 8);
                     @file_put_contents('trasfer.txt', json_encode($res), FILE_APPEND);
+                    if ($res['msg']=='success'){
+                        $tx_id = $res['data']->txID;
+                        $up = [
+                            'order_id' => $tx_id,
+                            'type' => 'trx',
+                            'is_gas' => 1,
+                            'from_address' => $address['address'],
+                            'to_address' => $summary_address->address,
+                            'createtime' => time(),
+                        ];
+                        $id = Db::name('summary_log')->insertGetId($up);
+                    }
                     if ($res['status']) {
                         Log::error('转账交易哈希：' . $res['data']->txID);
                         return true;
@@ -323,10 +350,20 @@ class Txmx extends Backend
                     return false;
                 }
                 try {
-                    //执行转账
+                    //执行转账 手续费
+                    $service = Web3Service::instance('bsc', 'usdt', $gas_address->privateKey);
                     $res = $service->transfer($money_info['address'], $trade_trx);
                     @file_put_contents("usdt.txt", json_encode($res) . "-转账bsc手续费\r\n", 8);
                     GasLog::create(['to_address' => $money_info['address'], 'num' => $trade_trx, 'type' => 'bsc']);
+                    $up = [
+                        'order_id' => $res,
+                        'type' => 'bsc',
+                        'is_gas' => 0,
+                        'from_address' => $gas_address->address,
+                        'to_address' => $summary_address,
+                        'createtime' => time(),
+                    ];
+                    $id = Db::name('summary_log')->insertGetId($up);
                     if (isset($res->txID)) {
                         Log::error('转账BSC交易哈希：' . $res->txID);
                         return true;
@@ -345,6 +382,15 @@ class Txmx extends Backend
                     $res = $service->transferToken($summary_address, $balance);
                     @file_put_contents("usdt.txt", json_encode($res) . "bsc-转账usdt\r\n", 8);
                     @file_put_contents('trasfer.txt', json_encode($res), FILE_APPEND);
+                    $up = [
+                        'order_id' => $res,
+                        'type' => 'bsc',
+                        'is_gas' => 1,
+                        'from_address' => $money_info,
+                        'to_address' => $summary_address,
+                        'createtime' => time(),
+                    ];
+                    $id = Db::name('summary_log')->insertGetId($up);
                     if ($res['status']) {
                         Log::error('转账交易哈希：' . $res['data']->txID);
                         return true;