Merge remote-tracking branch 'origin/master'

crmeb/subscribes/TaskSubscribe.php

@@ -125,15 +125,7 @@ class TaskSubscribe
         } catch (\Exception $e) {
             Db::rollback();
         }
-        try {
-//            $day_gets['XCH'] = 0;
-            $res = UserMiningMachine::dayMining();//每日挖矿
-            if (!$res) {
-                @file_put_contents('mining.txt', '【' . date('Y-m-d H:i:s') . '】' . UserMiningMachine::getErrorInfo() . PHP_EOL, FILE_APPEND);
-            }
-        } catch (\Exception $e) {
-            @file_put_contents('mining.txt', '【' . date('Y-m-d H:i:s') . '】' . $e->getMessage() . PHP_EOL, FILE_APPEND);
-        }
+        
         try {
             Db::startTrans();
             UserManageMoney::daySend();
@@ -155,7 +147,17 @@ class TaskSubscribe
      */
     public function onTask_60()
     {
+       try {
+  //            $day_gets['XCH'] = 0;
+              $res = UserMiningMachine::dayMining();//每日挖矿
+              if (!$res) {
+                  @file_put_contents('mining.txt', '【' . date('Y-m-d H:i:s') . '】' . UserMiningMachine::getErrorInfo() . PHP_EOL, FILE_APPEND);
+              }
+          } catch (\Exception $e) {
+              @file_put_contents('mining.txt', '【' . date('Y-m-d H:i:s') . '】' . $e->getMessage() . PHP_EOL, FILE_APPEND);
+          }
         (new CashTradeController())->all_money_redis();
+       
     }
 
     /**