Merge remote-tracking branch 'origin/master'

application/api/controller/Pay.php

@@ -939,16 +939,40 @@ class Pay extends Api
         $time = strtotime("-1 hours", time());
         $user_address = Db::name('user_usdt_address')->where('last_recharge', '>', $time)->order('last_recharge desc')->select();
         foreach ($user_address as $k => $v) {
+
             $user_info = Db::name('user')->where('id', $v['uid'])->find();
 //            trx部分
             $service = TronService::instance('usdt');
+            $time =bcmul($v['last_time'], 1000, 0);
+            $info = $service->getTransfer($v['trx_address'], $time);
+            foreach ($info['data'] as $k2 => $v2){
+                $transaction_id = $v2['transaction_id'];
+                $value =bcdiv($v2['value'], 1000000, 0);
+                $be = DB::name('user_recharge')->where('hash', $transaction_id)->find();
+                if ($be) {  //hash重复
+                    continue;
+                }
+                $number = date('ymdh', time()) . rand(10000, 99999);//订单编号
+                $data = [
+                    'order_id' => $number,
+                    'uid' => $v['uid'],
+                    'paid' => 1,
+                    'price' => $value,
+                    'hash' => $transaction_id,
+                    'pay_time' => time(),
+                    'add_time' => time()
+                ];
+                Db::name('user_recharge')->insert($data);
+                Db::name('user_usdt_address')->where('uid', $v['uid'])->update(['last_time' => time()]);
+                $money = bcadd($user_info['money'], $value, 18);
+                Db::name('user')->where('id', $v['uid'])->update(['money' => $money]);
+                MoneyLog::create(['user_id' => $v['uid'], 'money' => $value, 'before' => $user_info['money'], 'after' => $money, 'memo' => '用户trx余额充值']);
 
-            $info = $service->getTransfer($v['trx_address'], $v['last_time']);
-
+            }
 //                bsc部分
             $service = Web3Service::instance('bsc', 'usdt', '');
             $info = $service->getLastTransfer([], [$v['bsc_address']], $v['last_time']);
-            var_dump($info);die();
+
             foreach ($info as $k2 => $v2) {
                 $value = $v2->params['value']->toString();  //金额
                 $value2 = bcdiv($value, bcpow(10, get_token_info('bsc', 'USDT', 'decimal')), 12);
@@ -963,7 +987,7 @@ class Pay extends Api
                     'uid' => $v['uid'],
                     'paid' => 1,
                     'price' => $value2,
-                    'transactionHash' => $transactionHash,
+                    'hash' => $transactionHash,
                     'pay_time' => time(),
                     'add_time' => time()
                 ];
@@ -971,7 +995,7 @@ class Pay extends Api
                 Db::name('user_usdt_address')->where('uid', $v['uid'])->update(['last_time' => time()]);
                 $money = bcadd($user_info['money'], $value2, 18);
                 Db::name('user')->where('id', $v['uid'])->update(['money' => $money]);
-                MoneyLog::create(['user_id' => $v['uid'], 'money' => $value2, 'before' => $user_info['money'], 'after' => $money, 'memo' => '用户余额充值']);
+                MoneyLog::create(['user_id' => $v['uid'], 'money' => $value2, 'before' => $user_info['money'], 'after' => $money, 'memo' => '用户bsc余额充值']);
 
             }
             sleep(60);
@@ -1001,9 +1025,30 @@ class Pay extends Api
         $service = TronService::instance('usdt');
 
         $info = $service->getTransfer('TFRpdAs4SP1uoWcq8Kkx4769QQnJJGyPUX', 1748293200000);
-        foreach ($info['data'] as $k => $v) {
-            var_dump($v['transaction_id']);
-            var_dump($v['value']);
+        $user_info = Db::name('user')->where('id', 1571)->find();
+        foreach ($info['data'] as $k2 => $v2){
+            $transaction_id = $v2['transaction_id'];
+            $value =bcdiv($v2['value'], 1000000, 0);
+            $be = DB::name('user_recharge')->where('hash', $transaction_id)->find();
+            if ($be) {  //hash重复
+                continue;
+            }
+            $number = date('ymdh', time()) . rand(10000, 99999);//订单编号
+            $data = [
+                'order_id' => $number,
+                'uid' => 1571,
+                'paid' => 1,
+                'price' => $value,
+                'hash' => $transaction_id,
+                'pay_time' => time(),
+                'add_time' => time()
+            ];
+            Db::name('user_recharge')->insert($data);
+            Db::name('user_usdt_address')->where('uid', 1571)->update(['last_time' => time()]);
+            $money = bcadd($user_info['money'], $value, 18);
+            Db::name('user')->where('id', 1571)->update(['money' => $money]);
+            MoneyLog::create(['user_id' => 1571, 'money' => $value, 'before' => $user_info['money'], 'after' => $money, 'memo' => '用户trx余额充值']);
+
         }
         var_dump($info);die();
     }