Merge branch 'zjl_activity_20190718' into development

app/Http/Controllers/CronController.php

@@ -198,4 +198,14 @@ class CronController extends Controller
         return isset($temp['data']) ? $temp['data'] : 6.9;
         return isset($temp['data']) ? $temp['data'] : 6.9;
     }
     }
 
 
+    // 清除用户表数据和缓存数据
+    public function clearData()
+    {
+        $UserAmountModel = new UserAmountModel();
+        $RedisModel      = new RedisModel();
+
+        $UserAmountModel->truncate(); // 清空数据
+        $RedisModel->set('api_lx_activity_user_rank', null);
+    }
+
 }
 }
\ No newline at end of file

app/Http/routes.php

@@ -144,5 +144,6 @@ Route::group(['middleware' => 'api'], function () {
     Route::get ('/api/check/exportdimission',                     'SpecialController@exportDimission');
     Route::get ('/api/check/exportdimission',                     'SpecialController@exportDimission');
     Route::match (['get', 'post'], '/api/check/importdimission',  'SpecialController@importDimission');
     Route::match (['get', 'post'], '/api/check/importdimission',  'SpecialController@importDimission');
     Route::get('/act/useramoumt',                                 'CronController@userAmount'); // 活动统计用户实付金额
     Route::get('/act/useramoumt',                                 'CronController@userAmount'); // 活动统计用户实付金额
+    Route::get('/act/clear',                                      'CronController@clearData'); // 清除活动统计用户表和缓存
 });
 });