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

.env

@@ -4,6 +4,7 @@ APP_KEY=0uUBt7t4fFIttyqkyLxDhLC7gn9361Yt
 APP_TIMEZONE=PRC
 
 DB_CONNECTION=mysql
+#DB_HOST=192.168.2.232
 DB_HOST_R=192.168.2.232
 DB_HOST_W=192.168.2.232
 DB_PORT=3306

app/Http/Controllers/UserExchangesController.php

@@ -200,7 +200,7 @@ class UserExchangesController extends Controller
 
             //金额小于20元时，推送一个异步任务（用来提现或者充值），延时10秒，防止主从同步不及时
             //同时还要是type=1(话费充值)的时候,才会去进行兑现,因为目前微信还不能够直接走兑现任务
-            if ($data['amount'] < 20 || $data['type'] == 1) {
+            if ($data['amount'] < 20 && $data['type'] == 1) {
                 $Task = new ExchangesTask($data, $ic_exchange_settings);
                 $Task->delay(10);
                 $result = Task::deliver($Task);

app/Models/Code.php

@@ -116,7 +116,7 @@ class Code extends Model
             if (!$result) {
                 return false;
             } else {
-                $codeUserId = substr($code, 2);
+                $codeUserId = substr($code, 3);
                 //两方都会添加红包,所以要走第二次流水
                 $data['user_id'] = $codeUserId;
                 //传入code的拥有者即可对他的流水进行添加

storage/laravels.pid

-26901
\ No newline at end of file
+2170
\ No newline at end of file