Merge branch 'feature/optimize' into develop

common/business/ExchangeBusiness.php

@@ -67,8 +67,13 @@ class ExchangeBusiness
     public static function getquatation($tag = 'btc')
     {
         $coin_quotation_disable_items = Yii::$app->params['coin_quotation_disable_items'];
-        if (strtoupper($tag) == 'CCNY' || strtoupper($tag) == 'CNYT') {
+        if (strtoupper($tag) == 'CCNY' || strtoupper($tag) == 'CNYT' || strtoupper($tag) == 'ETC') {
             $exchange = ExchangeFactory::createExchange("Zhaobi");
+            if (strtoupper($tag) == 'ETC') {
+                $quotation = $exchange->getTicker($tag, 'USDT');
+                $quotation['rmb'] = (float)sprintf("%0.4f", $quotation['last']);
+                goto doEnd;
+            }
             $rate = $exchange->getTicker("BTY", "USDT");
             $rate = (float)$rate['rmb'] / $rate['last'];
             $quotation['rmb'] = 1.00;
@@ -309,7 +314,7 @@ class ExchangeBusiness
         $exchange = ExchangeFactory::createExchange("Go");
         $rate = $exchange->getTicker("CNY", "USD");
         $cny_usd_rate = 1 / $rate['last'];
-        if (in_array(strtoupper($tag), ['FOLI', 'CIC', 'KPC8', 'BVA', 'DAG', 'BNC', 'GHP', 'DRA'])) {
+        if (in_array(strtoupper($tag), ['FOLI', 'CIC', 'KPC8', 'BVA', 'DAG', 'BNC', 'GHP', 'DRA', 'ETC'])) {
             $quotation['usd'] = (float)sprintf("%0.4f", $quotation['last']);
             $quotation['rmb'] = (float)sprintf("%0.4f", $quotation['last'] / $cny_usd_rate);
         } else if (in_array(strtoupper($tag), ['SUSD'])) {

wallet/controllers/NoticeController.php

@@ -3,6 +3,7 @@
 namespace wallet\controllers;
 
 use common\models\pwallet\Notice;
+use common\models\User;
 use Yii;
 use yii\data\Pagination;
 use wallet\base\BaseController;
@@ -18,13 +19,14 @@ class NoticeController extends BaseController
         $page = Yii::$app->request->get('page', 1);
         $size = Yii::$app->request->get('size', 10);
         $group = Yii::$app->request->getGroup();
-        if ('administrator' == $group) {
-            $platform_id = Yii::$app->request->get('platform_id', Yii::$app->request->getPlatformId());
-        } else {
-            $platform_id = Yii::$app->request->getPlatformId();
-        }
 
         if (Yii::$app->request->isPost) {
+            if (User::AUTH_SUPER == $group) {
+                $platform_id = Yii::$app->request->post('platform_id', Yii::$app->request->getPlatformId());
+            } else {
+                $platform_id = Yii::$app->request->getPlatformId();
+            }
+
             $model = new Notice();
             $model->setScenario(Notice::SCENARIOS_CREATE);
             $params = Yii::$app->request->post();
@@ -40,9 +42,14 @@ class NoticeController extends BaseController
         }
 
         if (Yii::$app->request->isGet) {
+            if (User::AUTH_SUPER == $group) {
+                $platform_id = Yii::$app->request->get('platform_id', Yii::$app->request->getPlatformId());
+            } else {
+                $platform_id = Yii::$app->request->getPlatformId();
+            }
             $status = Yii::$app->request->get('status', 0);
             $type = Yii::$app->request->get('type', 0);
-            $query = Notice::find()->select('id, title, type, create_time')->where(['platform_id' => $platform_id])->asArray();
+            $query = Notice::find()->where(['platform_id' => $platform_id]);
 
             if (false != $status) {
                 $query->andWhere(['status' => (int)$status]);
@@ -74,11 +81,7 @@ class NoticeController extends BaseController
         $code = 0;
         $data = null;
         $group = Yii::$app->request->getGroup();
-        if ('administrator' == $group) {
-            $platform_id = Yii::$app->request->get('platform_id', Yii::$app->request->getPlatformId());
-        } else {
-            $platform_id = Yii::$app->request->getPlatformId();
-        }
+        $platform_id = Yii::$app->request->getPlatformId();
 
         if (Yii::$app->request->isGet) {
             $id = Yii::$app->request->get('id');
@@ -100,7 +103,7 @@ class NoticeController extends BaseController
                 $code = -1;
                 goto doEnd;
             }
-            if ('administrator' != $group && $platform_id != $model->platform_id){
+            if (User::AUTH_SUPER != $group && $platform_id != $model->platform_id){
                 $msg = '无权操作';
                 $code = -1;
                 goto doEnd;
@@ -134,7 +137,7 @@ class NoticeController extends BaseController
         }
         if (Yii::$app->request->isDelete) {
             $model = Notice::findOne($id);
-            if ('administrator' != $group && $platform_id != $model->platform_id){
+            if (User::AUTH_SUPER != $group && $platform_id != $model->platform_id){
                 $msg = '无权删除';
                 $code = -1;
                 goto doEnd;