Merge branch 'feature/platform_currency' into develop

api/base/BaseController.php

@@ -19,12 +19,14 @@ class BaseController extends Controller
 
     public $header_list = [];
     public $lang;
+    public $currency_id;
+    public $platform_id;
 
     private static $default_header_list = [];
 
     public function init()
     {
-        if ('cli' !== php_sapi_name()){
+        if ('cli' !== php_sapi_name()) {
             $this->header_list = self::$default_header_list;
             $this->fzmCrossHeader();
         }
@@ -33,9 +35,15 @@ class BaseController extends Controller
     public function fzmCrossHeader()
     {
         $this->lang = \Yii::$app->request->headers->get('lang') ?? 'zh-CN';
-        if ('en' == strtolower($this->lang)){
+        if ('en' == strtolower($this->lang)) {
             $this->lang = 'en-US';
         }
+        if (\Yii::$app->request->headers->get('FZM-PLATFORM-ID')) {
+            $this->platform_id = \Yii::$app->request->headers->get('FZM-PLATFORM-ID');
+        }
+        if (\Yii::$app->request->headers->get('FZM-CURRENCY-ID')) {
+            $this->currency_id = \Yii::$app->request->headers->get('FZM-CURRENCY-ID');
+        }
     }
 
     public function beforeAction($action)
@@ -75,7 +83,7 @@ class BaseController extends Controller
             'errmsg' => $errmsg,
         ];
 
-        if($data !== null) {
+        if ($data !== null) {
             $result['data'] = Yii::createObject('yii\rest\Serializer')->serialize($data);
         }
 
@@ -83,7 +91,7 @@ class BaseController extends Controller
         $response->format = Response::FORMAT_JSON;
 
         //jsonp数据格式
-        if(!is_null($callback)) {
+        if (!is_null($callback)) {
             Yii::$app->getResponse()->format = Response::FORMAT_JSONP;
             $result = [
                 'data' => $result,

api/controllers/CoinController.php

@@ -15,6 +15,7 @@ use common\business\Chain33Business;
 use common\business\CoinBusiness;
 use common\business\ExchangeBusiness;
 use common\models\psources\Coin;
+use common\models\psources\CoinCurrency;
 use common\models\psources\CoinPlatformWithHold;
 use common\models\psources\CoinRecommend;
 use common\models\psources\MinerFee;
@@ -243,6 +244,12 @@ class CoinController extends BaseController
             foreach ($chains as $key => $value) {
                 $chain_quotation[$value] = ExchangeBusiness::getquatation($value);
             }
+
+            $currency = CoinCurrency::find()->where(['pj_id' => $this->currency_id])->one();
+            if (false != $currency) {
+                $last = Yii::$app->redis_currency->hmget('quotation_boc_' . 'CNY_' . $currency->symbol, 'last');
+            }
+
             foreach ($result['data'] as $key => &$value) {
                 if (!isset($value['nickname']) || empty($value['nickname'])) continue;
                 $nickname = json_decode($value['nickname'], true);
@@ -252,6 +259,7 @@ class CoinController extends BaseController
                 $value['chain_quotation'] = $chain_quotation[$value['chain']] ?: null;
                 $value['chain_rmb'] = isset($value['chain_quotation']['rmb']) ? $value['chain_quotation']['rmb'] : 0;
                 $value['chain_usd'] = isset($value['chain_quotation']['usd']) ? $value['chain_quotation']['usd'] : 0;
+                $value['country_rate'] = (false == $currency) ? '' : (float)sprintf("%0.4f", $last[0] * $value['rmb']);
             }
             return $result;
         }
@@ -365,7 +373,7 @@ class CoinController extends BaseController
         if (1 == $coin_info['treaty']) {
             $platform_with_hold['exer'] = 'user.p.' . $platform . '.token';
             if ('BTY' !== strtoupper($platform)) {
-                $platform_with_hold['tokensymbol'] = $platform.'.'.$coin_name;
+                $platform_with_hold['tokensymbol'] = $platform . '.' . $coin_name;
             } else {
                 $platform_with_hold['tokensymbol'] = $coin_name;
             }

api/controllers/IssueChainController.php

@@ -24,11 +24,7 @@ class IssueChainController extends BaseController
             goto doEnd;
         }
 
-        if (1 == $platform_id) {
-            $chain_model = CoinPlatform::find()->all();
-        } else {
         $chain_model = CoinPlatform::find()->where(['id' => $platform_id])->all();
-        }
 
         if (false == $chain_model) {
             $msg = '不存在的链';

api/controllers/TickerController.php

@@ -3,6 +3,8 @@
 namespace api\controllers;
 
 use common\components\Tools;
+use common\models\psources\CoinCurrency;
+use common\models\psources\CoinSupportedCurrency;
 use Yii;
 use yii\data\Pagination;
 use linslin\yii2\curl\Curl;
@@ -291,7 +293,7 @@ class TickerController extends BaseController
                     'btcusdt',
                     'ethusdt'
                 ]
-            ],[
+            ], [
                 'exchange' => 'zhaobi',
                 'symbol' => [
                     'btyusdt'
@@ -306,7 +308,7 @@ class TickerController extends BaseController
                         'btcusdt',
                         'ethusdt'
                     ],
-                ],[
+                ], [
                     'exchange' => 'dag',
                     'symbol' => [
                         'dagusdt'
@@ -322,7 +324,7 @@ class TickerController extends BaseController
                         'btcusdt',
                         'ethusdt'
                     ],
-                ],[
+                ], [
                     'exchange' => 'bitnasdaq',
                     'symbol' => [
                         'bncusdt'
@@ -344,4 +346,31 @@ class TickerController extends BaseController
 
         return ['code' => $code, 'msg' => $msg, 'data' => $data];
     }
+
+    public function actionCurrency()
+    {
+        $code = 0;
+        $data = null;
+        $platform_id = $this->platform_id;
+        if (false == $platform_id) {
+            $code = -1;
+            $msg = '请求参数错误!';
+            goto doEnd;
+        }
+        $currency = CoinSupportedCurrency::find()->where(['platform_id' => $platform_id])->all();
+        foreach ($currency as $val) {
+            $val->pj_id = $val->currency->pj_id;
+            $val->pj_name = $val->currency->pj_name;
+            $val->pj_symbol = $val->currency->pj_symbol;
+            unset($val->id);
+            unset($val->platform_id);
+            unset($val->currency_id);
+        }
+        $data = $currency;
+        $code = 0;
+        $msg = 'success';
+        doEnd :
+
+        return ['code' => $code, 'msg' => $msg, 'data' => $data];
+    }
 }
\ No newline at end of file

common/business/ExchangeBusiness.php

@@ -130,6 +130,13 @@ class ExchangeBusiness
             goto doEnd;
         }
 
+        if (in_array(strtoupper($tag), ['BNC'])) {
+            $exchange = ExchangeFactory::createExchange("Bitnasdaq");
+            $quotation = $exchange->getTicker($tag, 'USDT');
+            $quotation['rmb'] = (float)sprintf("%0.2f", $quotation['last']);
+            goto doEnd;
+        }
+
         if (in_array(strtoupper($tag), ['GM', 'BSTC'])) {
             $exchange = ExchangeFactory::createExchange("Token7");
             $quotation = $exchange->getTicker($tag, 'HA');
@@ -289,7 +296,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'])) {
+        if (in_array(strtoupper($tag), ['FOLI', 'CIC', 'KPC8', 'BVA', 'DAG', 'BNC'])) {
             $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'])) {

common/models/psources/CoinCurrency.php

+<?php
+
+namespace common\models\psources;
+
+use Yii;
+use common\core\BaseActiveRecord;
+
+class CoinCurrency extends BaseActiveRecord
+{
+    public static function getDb()
+    {
+        return Yii::$app->get('p_sources');
+    }
+
+    public static function tableName()
+    {
+        return '{{coin_currency}}';
+    }
+
+    //定义场景
+    const SCENARIOS_CREATE = 'create';
+    const SCENARIOS_UPDATE = 'update';
+
+
+    public function rules()
+    {
+        return [
+            [['pj_id', 'pj_name'], 'required'],
+            [['pj_symbol', 'lang'], 'safe'],
+            [['platform_id', 'currency_id'], 'integer'],
+        ];
+    }
+
+    public function attributeLabels()
+    {
+        return [
+            'platform_id' => '钱包Id',
+            'currency_id' => '货币Id',
+        ];
+    }
+
+    public function scenarios()
+    {
+        $scenarios = [
+            self:: SCENARIOS_CREATE => ['pj_id', 'pj_name', 'pj_symbol', 'lang'],
+            self:: SCENARIOS_UPDATE => ['id', 'pj_id', 'pj_name', 'pj_symbol', 'lang'],
+        ];
+        return array_merge(parent:: scenarios(), $scenarios);
+    }
+}
\ No newline at end of file

common/models/psources/CoinPlatform.php

@@ -89,4 +89,9 @@ class CoinPlatform extends BaseActiveRecord
     {
         return $this->hasOne(CoinSupportedCoin::className(), ['id' => 'charge_unit_id']);
     }
+
+    public function getCurrency()
+    {
+        return $this->hasMany(CoinSupportedCurrency::className(), ['platform_id' => 'id']);
+    }
 }

common/models/psources/CoinSupportedCurrency.php

+<?php
+
+namespace common\models\psources;
+
+use Yii;
+use common\core\BaseActiveRecord;
+
+class CoinSupportedCurrency extends BaseActiveRecord
+{
+
+    public static function getDb()
+    {
+        return Yii::$app->get('p_sources');
+    }
+
+    public static function tableName()
+    {
+        return '{{coin_supported_currency}}';
+    }
+
+    //定义场景
+    const SCENARIOS_CREATE = 'create';
+    const SCENARIOS_UPDATE = 'update';
+
+
+    public function rules()
+    {
+        return [
+            [['platform_id', 'currency_id'], 'required'],
+            [['platform_id', 'currency_id'], 'integer'],
+        ];
+    }
+
+    public function attributeLabels()
+    {
+        return [
+            'platform_id' => '钱包Id',
+            'currency_id' => '货币Id',
+        ];
+    }
+
+    public function scenarios()
+    {
+        $scenarios = [
+            self:: SCENARIOS_CREATE => ['platform_id', 'currency_id'],
+            self:: SCENARIOS_UPDATE => ['id', 'platform_id', 'currency_id'],
+        ];
+        return array_merge(parent:: scenarios(), $scenarios);
+    }
+
+    public function attributes()
+    {
+        return array_merge(parent::attributes(), ['pj_id', 'pj_name', 'pj_symbol']);
+    }
+
+    public function getCurrency()
+    {
+        return $this->hasOne(CoinCurrency::className(), ['id' => 'currency_id']);
+    }
+
+    public static function loadArray(array $data)
+    {
+        return self::getDb()->createCommand()->batchInsert(self::tableName(),
+            ['platform_id', 'currency_id'],
+            $data)->execute();
+    }
+}
\ No newline at end of file

console/controllers/TickerController.php

@@ -2,13 +2,12 @@
 
 namespace console\controllers;
 
-use common\business\Chain33Business;
-use common\models\psources\CoinGameBet;
-use common\service\chain33\Chain33Service;
-use common\service\exchange\ExchangeBuilderFactory;
-use common\service\exchange\ExchangeFactory;
-use yii\console\Controller;
 use Yii;
+use linslin\yii2\curl\Curl;
+use yii\console\Controller;
+use voku\helper\HtmlDomParser;
+use common\models\psources\CoinSupportedCurrency;
+use common\service\exchange\ExchangeBuilderFactory;
 
 class TickerController extends Controller
 {
@@ -22,7 +21,7 @@ class TickerController extends Controller
                 $ticker_builder->TickerSort();
             });
         }
-        echo date('Y-m-d H:i:s') .'排序更新成功' . PHP_EOL;
+        echo date('Y-m-d H:i:s') . '排序更新成功' . PHP_EOL;
         return 0;
     }
 
@@ -30,7 +29,36 @@ class TickerController extends Controller
     {
         $ticker_builder = ExchangeBuilderFactory::create('Huobi');
         $ticker_builder->hotTickerUpdate();
-        echo date('Y-m-d H:i:s') .'更新成功' . PHP_EOL;
+        echo date('Y-m-d H:i:s') . '更新成功' . PHP_EOL;
+        return 0;
+    }
+
+    public function actionCurrency()
+    {
+        $currency_model = CoinSupportedCurrency::find()->groupBy('currency_id')->all();
+        $curl = new Curl();
+        foreach ($currency_model as $val) {
+            go(function () use ($val, $curl) {
+                \Co::sleep(0.5);
+                $response = $curl->setPostParams([
+                    'erectDate' => '',
+                    'nothing' => '',
+                    'pjname' => $val->currency->pj_id
+                ])->post('http://srh.bankofchina.com/search/whpj/search.jsp');
+
+                $response = iconv('UTF-8', 'GBK//TRANSLIT', $response);
+                $html = HtmlDomParser::str_get_html($response);
+                $div = ($html->find('div.BOC_main'));
+                foreach ($div->find('td') as $key => $e) {
+                    if ($key == 5) {
+                        $key = 'quotation_boc_' . 'CNY_' . $val->currency->symbol;
+                        $currency = rtrim(sprintf('%.6f', 1 / ($e->innertext / 100)), '0');
+                        Yii::$app->redis_currency->hmset($key, 'low', $currency, 'high', $currency, 'last', $currency, 'open', $currency);
+                    }
+                }
+            });
+        }
+        echo date('Y-m-d H:i:s') . '计价货币更新成功' . PHP_EOL;
         return 0;
     }
 }
\ No newline at end of file

wallet/controllers/WalletController.php

@@ -2,11 +2,13 @@
 
 namespace wallet\controllers;
 
-use common\service\trusteeship\TrusteeShipService;
 use Yii;
-use common\models\Admin;
+use yii\helpers\ArrayHelper;
 use wallet\base\BaseController;
 use common\models\psources\CoinPlatform;
+use common\models\psources\CoinCurrency;
+use common\models\psources\CoinSupportedCurrency;
+use common\service\trusteeship\TrusteeShipService;
 
 class WalletController extends BaseController
 {
@@ -32,16 +34,16 @@ class WalletController extends BaseController
     public function actionWalletBallance()
     {
         $current_platform_id = Yii::$app->request->getPlatformId();
-        if(1 === $current_platform_id) {
+        if (1 === $current_platform_id) {
             $platform_id = Yii::$app->request->get('platform_id', 1);
             $platform_id = empty($platform_id) ? 1 : $platform_id;
         } else {
             $platform_id = Yii::$app->request->getPlatformId();
         }
-        if(!isset(Yii::$app->params['trusteeship']['node_'. $platform_id])){
+        if (!isset(Yii::$app->params['trusteeship']['node_' . $platform_id])) {
             return ['code' => -1, 'data' => [], 'msg' => '此钱包节点尚未开通'];
         }
-        $node_params = Yii::$app->params['trusteeship']['node_'. $platform_id];
+        $node_params = Yii::$app->params['trusteeship']['node_' . $platform_id];
 
         $type = Yii::$app->request->get('type', 1);
         $page = Yii::$app->request->get('page', 1);
@@ -76,7 +78,7 @@ class WalletController extends BaseController
     public function actionUserAsset()
     {
         $platform_id = Yii::$app->request->getPlatformId();
-        $node_params = Yii::$app->params['trusteeship']['node_'. $platform_id];
+        $node_params = Yii::$app->params['trusteeship']['node_' . $platform_id];
         $uid = Yii::$app->request->get('uid', '');
         $params = [
             'uid' => $uid
@@ -101,4 +103,56 @@ class WalletController extends BaseController
         return ['code' => 1, 'data' => $result['msg'], 'msg' => 'success'];
     }
 
+    public function actionCurrency()
+    {
+        $code = 0;
+        $msg = 'success';
+        $data = null;
+        $current_platform_id = Yii::$app->request->getPlatformId();
+        if (Yii::$app->request->isGet) {
+            if (1 === $current_platform_id) {
+                $platform_id = Yii::$app->request->get('platform_id', 1);
+                $platform_id = empty($platform_id) ? 1 : $platform_id;
+            } else {
+                $platform_id = Yii::$app->request->getPlatformId();
+            }
+
+            $coin_currency = CoinCurrency::find()->select('id, pj_name')->asArray()->all();
+
+            $coin_supported_currency = CoinSupportedCurrency::find()->where(['platform_id' => $platform_id])->asArray()->all();
+            $coin_supported_currency_id = ArrayHelper::getColumn($coin_supported_currency, 'currency_id');
+            foreach ($coin_currency as &$val) {
+                $val['checked'] = false;
+                if (in_array($val["id"], $coin_supported_currency_id)) {
+                    $val['checked'] = true;
+                }
+            }
+            $data = $coin_currency;
+            goto doEnd;
+        }
+
+        if (Yii::$app->request->isPut) {
+            $params = Yii::$app->request->post();
+            $currency_ids = isset($params['currency_id']) ? $params['currency_id'] : null;
+            if (false == $currency_ids) {
+                $msg = '参数错误';
+                $code = -1;
+                goto doEnd;
+            }
+            CoinSupportedCurrency::deleteAll(['in', 'platform_id', $current_platform_id]);
+
+            $currency_id_arr = explode(',', $currency_ids);
+            foreach ($currency_id_arr as $val) {
+                $datas[] = [
+                    $current_platform_id, (int)$val
+                ];
+            }
+            CoinSupportedCurrency::loadArray($datas);
+            goto doEnd;
+        }
+
+        doEnd :
+
+        return ['code' => $code, 'msg' => $msg, 'data' => $data];
+    }
 }
\ No newline at end of file