Merge branch 'feature/airdrop' into 'master'

backend/controllers/CoinTransferController.php

@@ -67,27 +67,16 @@ class CoinTransferController extends BaseController
 
     public function actionBatchTransfer()
     {
-        $model = CoinTransfer::find()->where(['hash' => '-----------------'])->limit(30)->all();
+        $model = CoinTransfer::find()->where(['status' => 0])->limit(30)->all();
         foreach ($model as $val){
-            echo $val->address."<br/>";
-            $id = $val->id;
-
             $to = $val->address;
-            #$amount = str_replace(" TSC", "", $val->amount) * 1e8;
             $amount = $val->amount * 1e8;
             $fee = 100000;
             $note = '';
             $execer = 'user.p.tschain.coins';
 
-//            $isExist = CoinTransfer::find()->where(['address' => $val->address, 'status' => 1])->one();
-//            if($isExist){
-//                $updateModel = CoinTransfer::findOne($val->id);
-//                $updateModel->hash = '-----------------';
-//                $updateModel->status = 1;
-//                $updateModel->save();
-//                continue;
-//            }
-
+            $isExist = CoinTransfer::find()->where(['address' => $val->address, 'status' => 1])->one();
+            if($isExist) continue;
 
             $service = new Chain33Service();
             $createRawTransaction  = $service->createRawTransaction($to, $amount, $fee, $note, $execer);
@@ -106,7 +95,7 @@ class CoinTransferController extends BaseController
             }
             $sign_str = $signRawTx['result'];
             $result = $service->sendTransaction($sign_str);
-
+            var_dump($result);exit;
             if(0 != $result['code']){
                 continue;
             }