Merge branch 'feature/optimize' into develop

api/controllers/AirDropController.php

@@ -154,7 +154,7 @@ class AirDropController extends BaseController
         }
 
         $this->data = AirDropApplyRecord::find()
-            ->where(['apply_id' => $model['id'], 'reach' => AirDropApplyRecord::REACH_YES])
+            ->where(['apply_id' => $model['id'], 'draw_status' => AirDropApplyRecord::STATUS_DRAW_SUEEESS])
             ->sum('amount');
         if (empty($this->data)) {
             $this->data = 0;

console/controllers/OrderController.php

@@ -165,7 +165,7 @@ class OrderController extends Controller
                 $execer = 'paracross';
                 $func_name = 'GetTitle';
                 $playload = [
-                    'data' => 'user.p.'.$val['consensus_platform'] . '.'
+                    'data' => 'user.p.' . $val['consensus_platform'] . '.'
                 ];
                 $result = $service->chainQuery($execer, $func_name, $playload);
                 if (!isset($result['result'])) {
@@ -175,6 +175,19 @@ class OrderController extends Controller
                 if ($consensHeight < $height) {
                     continue;
                 }
+
+                $func_name = 'GetAssetTxResult';
+                $playload = [
+                    'data' => $val['send_result']
+                ];
+                $result = $service->chainQuery($execer, $func_name, $playload);
+                if (!isset($result['result'])) {
+                    continue;
+                }
+                $tx_result = $result['result']['success'];
+                if (false == $tx_result) {
+                    continue;
+                }
             }
             $currentModel = CoinCTocTransfer::findOne($val['id']);
             $currentModel->query_result = $query_result;