Commit 25197a36 authored by shajiaiming's avatar shajiaiming

fix

parent 10d8c5b2
......@@ -33,11 +33,14 @@ class OrderController extends BaseController
$data['transfer_number'] = date('YmdHis') . self::getrandnums();
$redis = Yii::$app->redis;
if ($redis->exists('C2C_' . $post['address'] . '_' . $data['is_sell'])) {
$key = 'C2C_' . $post['address'] . '_' . $data['is_sell'] . '_' . str_replace('/', '-', $post['token_name']) . '_' . str_replace('/', '-', $post['market_name']);
if ($redis->exists($key)) {
$msg = '尚存在一笔未完成的交易!';
goto doEnd;
}
$redis->set('C2C_' . $post['address'] . '_' . $data['is_sell'], time());
$redis->set($key, time());
foreach ($post['txs'] as $key => $val) {
$model = new CoinCTocTransfer();
......@@ -99,7 +102,7 @@ class OrderController extends BaseController
$type = Yii::$app->request->get('type', '');
$page = Yii::$app->request->get('page', 1);
if(empty($address)){
if (empty($address)) {
$msg = '请求参数错误';
$code = -1;
$data = null;
......@@ -107,15 +110,15 @@ class OrderController extends BaseController
}
$query = CoinCTocTransfer::find()
->where('address= :address',[':address' => $address])
->where('address= :address', [':address' => $address])
->orderBy('create_time desc')
->groupBy('address, is_sell');
if ($is_sell > -1) {
$query->andWhere('is_sell= :is_sell',[':is_sell' => $is_sell]);
$query->andWhere('is_sell= :is_sell', [':is_sell' => $is_sell]);
}
if (false != $type) {
$query->andWhere('type= :type',[':type' => $type]);
$query->andWhere('type= :type', [':type' => $type]);
}
$data = $query->offset(($page - 1) * 20)->limit(20)->asArray()->all();
$countQuery = clone $query;
......@@ -124,7 +127,7 @@ class OrderController extends BaseController
'list' => $data,
'page' => [
'pageCount' => $pages->pageCount,
'pageSize' => 20,
'pageSize' => 20,
'currentPage' => $page,
]
];
......
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