Merge branch 'hotfix/pay_channel_modify' into feature/market_percentage

Application/Admin/Controller/CompanyGameRatioController.class.php

@@ -143,7 +143,7 @@ class CompanyGameRatioController extends AdminController
                 ->join("JOIN tab_promote_company p ON ( m.company_id = p.id".$pwhere.")")
                 ->where($where)->find()['count'];
         $this->assign('data', $dbres);
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }
@@ -317,7 +317,7 @@ class CompanyGameRatioController extends AdminController
                 ->join("JOIN tab_promote_company p ON ( m.company_id = p.id".$pwhere.")")
                 ->where($where)->find()['count'];
         $this->assign('data', $dbres);
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }

Application/Admin/Controller/CompanyRelationController.class.php

@@ -107,7 +107,7 @@ class CompanyRelationController extends AdminController
 
         $count = $this->DBModel->field("count(id) count")->where($where)->find()['count'];
         $this->assign('data', $dbres);
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }
@@ -223,7 +223,7 @@ class CompanyRelationController extends AdminController
 
         $count = $this->DBlogModel->field("count(id) count")->where($where)->find()['count'];
         $this->assign('data', $dbres);
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }

Application/Admin/Controller/CompanyStatementController.class.php

@@ -178,9 +178,9 @@ class CompanyStatementController extends ThinkController
         }
         $count =  M("company_statement","tab_")->field("count(id) count,IFNULL(SUM(CASE WHEN withdraw_type < 2 THEN platform_amount ELSE 0 END),0) as platform_amount,SUM(statement_money) as statement_money")->where($map)->find();
         // dd($count);
-        $parameter['p'] = $page;
+        $params['p'] = $page;
-        $parameter['row'] = $row;
+        $params['row'] = $row;
-        $page = set_pagination($count['count'], $row, $parameter);
+        $page = set_pagination($count['count'], $row, $params);
         if ($page) {
             $this->assign('_page', $page);
         }

Application/Admin/Controller/CompanyStatementLackController.class.php

@@ -83,9 +83,9 @@ class CompanyStatementLackController extends ThinkController
         
         $count =  $this->DBModel->field("count(id) count,sum(statement_money) statement_money")->where($map)->find();
         // dd($count);
-        $parameter['p'] = $page;
+        $params['p'] = $page;
-        $parameter['row'] = $row;
+        $params['row'] = $row;
-        $page = set_pagination($count['count'], $row, $parameter);
+        $page = set_pagination($count['count'], $row, $params);
         if ($page) {
             $this->assign('_page', $page);
         }

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -165,9 +165,9 @@ class CompanyStatementPoolController extends ThinkController
         }
         $count =  $this->DBModel->field("count(id) count,SUM(statement_money) as statement_money")->where($map)->find();
         // dd($count);
-        $parameter['p'] = $page;
+        $params['p'] = $page;
-        $parameter['row'] = $row;
+        $params['row'] = $row;
-        $page = set_pagination($count['count'], $row, $parameter);
+        $page = set_pagination($count['count'], $row, $params);
         if ($page) {
             $this->assign('_page', $page);
         }

Application/Admin/Controller/CompanyStatementSetController.class.php

@@ -252,7 +252,7 @@ class CompanyStatementSetController extends Controller {
 				$game['pay_amount'] =$va['pay_money'];
 				$game['game_name'] =$ke;
 				//获取游戏id及比例
-				$game_id = $GameDb->where("game_name='{$ke}' OR relation_game_name='{$ke}'")->field("id,relation_game_id")->find();
+				$game_id = $GameDb->where("game_name='{$ke}' OR original_package_name='{$ke}'")->field("id,relation_game_id")->find();
 				if(empty($game_id)){
 					$game['relation_game_id']=0;
 					// $game['sum_money']=0;

Application/Admin/Controller/GameRatioMouldController.class.php

@@ -81,7 +81,7 @@ class GameRatioMouldController extends AdminController
 
        $count = $this->DBModel->alias('m')->field("count(id) count")->join("INNER JOIN ({$gameres}) g ON m.relation_game_id = g.relation_game_id")->where($where)->find()['count'];
        $this->assign('data', $dbres);
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }

Application/Admin/Controller/PayChannelController.class.php

@@ -449,11 +449,15 @@ class PayChannelController extends ThinkController
             ->group('pay_way')
             ->select(false);
 
-
+        $superMap = $map;
+        if ($map['payed_time']){
+            $superMap['pay_time'] = $map['payed_time'];
+            unset($superMap['payed_time']);
+        }
         //超级签数据
         $superSignDataPay = M('game_supersign','tab_')
             ->field("sum(pay_price) as pay_amount,pay_way")
-            ->where($map)
+            ->where($superMap)
             ->group('pay_way')
             ->select(false);
 
@@ -462,8 +466,8 @@ class PayChannelController extends ThinkController
         //推广后台充值数据
         $spreadMap['order_status'] = array('egt',1);
         $spreadMap['pay_way'] = array('egt',1);
-        if($map['pay_time']) {
+        if($map['payed_time']) {
-            $spreadMap['create_time'] = $map['pay_time'];
+            $spreadMap['pay_time'] = $map['payed_time'];
         }
 //        $spreadMap['promote_id'] = $map['promote_id'];
         //推广后台
@@ -472,9 +476,9 @@ class PayChannelController extends ThinkController
             ->where($spreadMap)
             ->select(false);
 
-        if ($map['pay_time']) {
+        if ($map['payed_time']) {
-            $map['create_time'] = $map['pay_time'];
+//            $map['payed_time'] = $map['payed_time'];
-            $testMap['pay_time'] = $map['pay_time'];
+            $testMap['pay_time'] = $map['payed_time'];
             unset($map['pay_time']);
         }
         //充值平台币数据
@@ -488,10 +492,10 @@ class PayChannelController extends ThinkController
                 $map['tab_deposit.pay_way'] = $map['pay_way'];
                 unset($map['pay_way']);
             }
-            if ($map['create_time']) {
+//            if ($map['create_time']) {
-                $map['tab_deposit.create_time'] = $map['create_time'];
+//                $map['tab_deposit.create_time'] = $map['create_time'];
-                unset($map['create_time']);
+//                unset($map['create_time']);
-            }
+//            }
             $map['tab_deposit.pay_source'] = 2;
             $map['tab_pay_info.extend'] = '';
 
@@ -532,6 +536,9 @@ class PayChannelController extends ThinkController
         //将语句整合起来查询
         $channelData = "select sum(pay_amount) as pay_amount,pay_way from ({$sql})t group by pay_way;";
 //        var_dump($channelData);die();
+
+//        $channelData = M()->table("({$channelData})a")->where()->select();
+
         $channelData = M()->query($channelData);
 
         return $channelData;

Application/Admin/View/CompanyStatement/lists.html

@@ -252,9 +252,6 @@
 
     </div>
     <div class="page">
-        <if condition="$role_export_check eq true ">
-            <!-- <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a> -->
-        </if>
         {$_page|default=''}
     </div>
     <div style="width: 100vw;height: 100vh;padding: 0;position: absolute;top: 0;z-index: 9999;display: none;" id="creat_msg">

Application/Admin/View/Partner/add.html

@@ -259,7 +259,6 @@
             format: 'yyyy-mm-dd',
             language:"zh-CN",
             minView: "month",
-            startDate:new Date(),
             autoclose:true
         }).change(function(){
             var start = new Date($(this).val()).getTime();
@@ -276,7 +275,6 @@
             format: 'yyyy-mm-dd',
             language:"zh-CN",
             minView: "month",
-            startDate:new Date(),
             autoclose:true
         }).change(function(){
             var end = new Date($(this).val()).getTime();

Application/Admin/View/Partner/edit.html

@@ -261,7 +261,6 @@
             format: 'yyyy-mm-dd',
             language:"zh-CN",
             minView: "month",
-            startDate:new Date(),
             autoclose:true
         }).change(function(){
             var start = new Date($(this).val()).getTime();
@@ -278,7 +277,6 @@
             format: 'yyyy-mm-dd',
             language:"zh-CN",
             minView: "month",
-            startDate:new Date(),
             autoclose:true
         }).change(function(){
             var end = new Date($(this).val()).getTime();