Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx

Application/Admin/Controller/SpendCountSetController.class.php

@@ -51,7 +51,7 @@ class SpendCountSetController extends \Think\Controller
         $countRes = M("spend_count","tab_")->field("count(*) date_count")->where("count_date = '{$this->date}'")->find()['date_count'];
         $countUserRes = M("spend_user_count","tab_")->field("count(*) date_count")->where("count_date = '{$this->date}'")->find()['date_count'];
         if($countRes > 0 || $countUserRes >0){
-            die("error:Repeated statistics");
+            die("error:Repeated statistics,msg:{$this->date}已经聚合过");
         }
         $this->model->startTrans();
         $this->usermodel->startTrans();
@@ -81,7 +81,7 @@ class SpendCountSetController extends \Think\Controller
         # code...
     }
     //获取游戏现金流水
-    public function getCashData()
+    protected function getCashData()
     {
         if(!$this->continue){
             die("api error");
@@ -115,7 +115,7 @@ class SpendCountSetController extends \Think\Controller
         # code...
     }
     //获取平台币聚合
-    public function getBalanceData()
+    protected function getBalanceData()
     {
         if(!$this->continue){
             die("api error");
@@ -169,7 +169,7 @@ class SpendCountSetController extends \Think\Controller
         # code...
     }
     //获取绑定币充值
-    public function getInsideData()
+    protected function getInsideData()
     {
         if(!$this->continue){
             die("api error");
@@ -222,7 +222,7 @@ class SpendCountSetController extends \Think\Controller
         }
     }
 
-    public function getRoot()
+    protected function getRoot()
     {
         if(!$this->continue){
             die("api error");
@@ -268,7 +268,7 @@ class SpendCountSetController extends \Think\Controller
 
     }
      //获取会长信息
-    public function getRootUser()
+    protected function getRootUser()
     {
         if(!$this->continue) die("api error");
         //获取所有数据
@@ -310,7 +310,7 @@ class SpendCountSetController extends \Think\Controller
     }
     
     //获取组长信息
-    public function getParentUser()
+    protected function getParentUser()
     {
         if(!$this->continue) die("api error");
         $month =$this->date;
@@ -350,7 +350,7 @@ class SpendCountSetController extends \Think\Controller
     }
    
     //获取组员
-    public function getPromoteUser()
+    protected function getPromoteUser()
     {
         if(!$this->continue) die("api error");
         $month = $this->date;;
@@ -388,7 +388,7 @@ class SpendCountSetController extends \Think\Controller
         # code...
     }
     //渠道角色统计仅计算推广员的平台币发放与收回
-    public function getUserInsideData()
+    protected function getUserInsideData()
     {
         // if(!$this->continue) die("api error");
         //获取发送给推广员的数据
@@ -545,7 +545,7 @@ class SpendCountSetController extends \Think\Controller
         # code...
     }
     //按角色修正inside_cash_count数据
-    public function setInsideCount($promote_id,$inside_cash_count)
+    protected function setInsideCount($promote_id,$inside_cash_count)
     {
         $tempmap = array(
             "promote_id"=>$promote_id,