Commit f103215d authored by shajiaiming's avatar shajiaiming

修复已知问题

parent 439a8c23
...@@ -4,6 +4,7 @@ namespace api\controllers; ...@@ -4,6 +4,7 @@ namespace api\controllers;
use api\base\BaseController; use api\base\BaseController;
use common\models\psources\CoinAirDropTrade; use common\models\psources\CoinAirDropTrade;
use common\models\psources\CoinIssueTransfer;
use common\models\psources\CoinPlatform; use common\models\psources\CoinPlatform;
use common\service\chain33\Chain33Service; use common\service\chain33\Chain33Service;
use Yii; use Yii;
...@@ -16,7 +17,7 @@ class WalletController extends BaseController ...@@ -16,7 +17,7 @@ class WalletController extends BaseController
$code = 0; $code = 0;
$msg = 'success'; $msg = 'success';
$platform_id = Yii::$app->request->get('platform_id', ''); $platform_id = Yii::$app->request->get('platform_id', '');
if(empty($platform_id)){ if (empty($platform_id)) {
$msg = '参数不能为空'; $msg = '参数不能为空';
$code = -1; $code = -1;
$data = null; $data = null;
...@@ -24,7 +25,7 @@ class WalletController extends BaseController ...@@ -24,7 +25,7 @@ class WalletController extends BaseController
} }
$data = CoinPlatform::find()->select("name, download_url, introduce")->where(['id' => $platform_id])->asArray()->one(); $data = CoinPlatform::find()->select("name, download_url, introduce")->where(['id' => $platform_id])->asArray()->one();
if(empty($data)){ if (empty($data)) {
$msg = '数据不存在'; $msg = '数据不存在';
$data = null; $data = null;
$code = -1; $code = -1;
...@@ -39,16 +40,16 @@ class WalletController extends BaseController ...@@ -39,16 +40,16 @@ class WalletController extends BaseController
public function actionGameTradeUpdate() public function actionGameTradeUpdate()
{ {
$coinAirDropTrade = CoinAirDropTrade::find()->where(['attach' => 2 ,'msg' => '0'])->limit(30)->all(); $coinAirDropTrade = CoinAirDropTrade::find()->where(['attach' => 2, 'msg' => '0'])->limit(30)->all();
foreach ($coinAirDropTrade as $val){ foreach ($coinAirDropTrade as $val) {
$fee = 100000; $fee = 100000;
$amount = 1 * 1e8; $amount = 1 * 1e8;
$execer = 'coins'; $execer = 'coins';
$note = ''; $note = '';
$service = new Chain33Service(); $service = new Chain33Service();
$createRawTransaction = $service->createRawTransaction($val->coins_address, $amount, $fee, $note, $execer); $createRawTransaction = $service->createRawTransaction($val->coins_address, $amount, $fee, $note, $execer);
if(0 != $createRawTransaction['code']){ if (0 != $createRawTransaction['code']) {
continue; continue;
} }
...@@ -57,13 +58,13 @@ class WalletController extends BaseController ...@@ -57,13 +58,13 @@ class WalletController extends BaseController
$expire = '1m'; $expire = '1m';
$signRawTx = $service->signRawTx($privkey, $txHex, $expire); $signRawTx = $service->signRawTx($privkey, $txHex, $expire);
if(0 != $signRawTx['code']){ if (0 != $signRawTx['code']) {
continue; continue;
} }
$sign_str = $signRawTx['result']; $sign_str = $signRawTx['result'];
$result = $service->sendTransaction($sign_str); $result = $service->sendTransaction($sign_str);
if(0 != $result['code']){ if (0 != $result['code']) {
continue; continue;
} }
$currentModel = CoinAirDropTrade::findOne($val->id); $currentModel = CoinAirDropTrade::findOne($val->id);
...@@ -81,7 +82,7 @@ class WalletController extends BaseController ...@@ -81,7 +82,7 @@ class WalletController extends BaseController
$msg = 'success'; $msg = 'success';
$platform_id = Yii::$app->request->get('platform_id', ''); $platform_id = Yii::$app->request->get('platform_id', '');
$token = Yii::$app->request->get('address', ''); $token = Yii::$app->request->get('address', '');
if(empty($platform_id) || empty($token)){ if (empty($platform_id) || empty($token)) {
$msg = '参数不能为空'; $msg = '参数不能为空';
$code = -1; $code = -1;
$data = null; $data = null;
...@@ -91,7 +92,7 @@ class WalletController extends BaseController ...@@ -91,7 +92,7 @@ class WalletController extends BaseController
$service = new Chain33Service($node); $service = new Chain33Service($node);
$address[] = $token; $address[] = $token;
$execer = 'coins'; $execer = 'coins';
$result = $service->getBalance($address, $execer); $result = $service->getBalance($address, $execer);
if (0 !== $result['code']) { if (0 !== $result['code']) {
$msg = $result['msg']; $msg = $result['msg'];
$code = -1; $code = -1;
...@@ -102,4 +103,34 @@ class WalletController extends BaseController ...@@ -102,4 +103,34 @@ class WalletController extends BaseController
doEnd : doEnd :
return ['code' => $code, 'data' => $data, 'msg' => $msg]; return ['code' => $code, 'data' => $data, 'msg' => $msg];
} }
public function actionTransfer()
{
$code = -1;
$request = Yii::$app->request;
$post = $request->post();
if (!$request->isPost) {
$msg = '请求错误!';
goto doEnd;
}
$txhex = isset($post['txhex']) ? $post['txhex'] : '';
$issue_coin_id = isset($post['issue_coin_id']) ? $post['issue_coin_id'] : 0;
if (false == $txhex || false == $issue_coin_id) {
$msg = '参数错误!';
goto doEnd;
}
$model = new CoinIssueTransfer();
$data['txhex'] = $txhex;
$data['issue_coin_id'] = (int)$issue_coin_id;
$model->load($data, '');
$model->save();
$code = 0;
$msg = 'success';
doEnd :
return ['code' => $code, 'msg' => $msg];
}
} }
\ No newline at end of file
<?php
namespace common\models\psources;
use Yii;
use common\core\BaseActiveRecord;
class CoinIssueTransfer extends BaseActiveRecord
{
public static function getDb()
{
return Yii::$app->get('p_sources');
}
public static function tableName()
{
return '{{%coin_issue_transfer}}';
}
//定义场景
const SCENARIOS_CREATE = 'create';
public function rules()
{
return [
[['txhex', 'issue_coin_id'], 'required'],
[['send_result', 'query_result', 'msg'], 'safe']
];
}
public function scenarios()
{
$scenarios = [
self:: SCENARIOS_CREATE => ['txhex', 'issue_coin_id', 'send_result', 'query_result', 'msg'],
];
return array_merge(parent:: scenarios(), $scenarios);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment