Merge branch 'feature/c2c' into develop

api/controllers/OrderController.php

@@ -18,26 +18,29 @@ class OrderController extends BaseController
             goto doEnd;
         }
         $post = $request->post();
-        if (2 != count($post['txs'])) {
-            $msg = '交易笔数错误!';
-            goto doEnd;
-        }
+//        if (2 != count($post['txs'])) {
+//            $msg = '交易笔数错误!';
+//            goto doEnd;
+//        }
 
         $data['is_sell'] = (false == $post['isSell']) ? 0 : 1;
         $data['type'] = $post['type'];
         $data['address'] = $post['address'];
-        $data['token_name'] = $post['token_name'];
-        $data['market_name'] = $post['market_name'];
+        $data['token_name'] = strtoupper($post['token_name']);
+        $data['market_name'] = strtoupper($post['market_name']);
         $data['price'] = $post['price'];
         $data['amount'] = $post['amount'];
         $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,
             ]
         ];