Merge branch 'master' into ysx-ic助手服务开发-20190824

app/Http/Controllers/UserExchangesController.php

@@ -183,7 +183,7 @@ class UserExchangesController extends Controller
             $Redis->hset('ic_user' ,$UserInfo['user_id'] , json_encode($UserInfo));
             $Redis->hset('ic_user' ,$UserInfo['user_id'] , json_encode($UserInfo));
 
 
             //金额小于20元时，推送一个异步任务（用来提现或者充值），延时10秒，防止主从同步不及时
             //金额小于20元时，推送一个异步任务（用来提现或者充值），延时10秒，防止主从同步不及时
-            if($data['amount'] < 20){
+            if($data['amount'] < 20 && $data['type'] == 1){
                 $Task = new ExchangesTask($data,$ic_exchange_settings);
                 $Task = new ExchangesTask($data,$ic_exchange_settings);
                 $Task->delay(10);
                 $Task->delay(10);
                 $result = Task::deliver($Task);
                 $result = Task::deliver($Task);