Merge branch 'feature/optimize' into develop

api/controllers/AirDropController.php

@@ -18,13 +18,21 @@ class AirDropController extends BaseController
         $data = Yii::$app->request->get();
 
         $identifier = $data['identifier'] ?? null;
-        if (false == $identifier) {
+        $miner_address = $data['miner_address'] ?? null;
+        if (false == $identifier || false == $miner_address) {
             $this->code = -1;
             $this->msg = '设备号错误，请重新输入.';
             goto doEnd;
         }
 
-        $exist = AirDropRulePool::find()->where(['identifier' => $identifier])->one();
+//        $exist = AirDropRulePool::find()->where(['identifier' => $identifier])->one();
+//        if (false == $exist || false == $exist->rule) {
+//            $this->code = -1;
+//            $this->msg = '设备号错误，请重新输入.';
+//            goto doEnd;
+//        }
+
+        $exist = AirDrop::find()->where(['identifier' => $identifier, 'miner_address' => $miner_address])->one();
         if (false == $exist || false == $exist->rule) {
             $this->code = -1;
             $this->msg = '设备号错误，请重新输入.';

common/business/ExchangeBusiness.php

@@ -144,10 +144,10 @@ class ExchangeBusiness
 
         if (strtoupper($tag) == 'POKE') {
             $quotation = [
-                'low' => 0.1617,
-                'high' => 0.1617,
-                'last' => 0.1617,
-                'rmb' => 0.1617,
+                'low' => 0.1621,
+                'high' => 0.1621,
+                'last' => 0.1621,
+                'rmb' => 0.1621,
             ];
             goto doEnd;
         }