From 1e80004e3eea07cdbce715661fc521e54579a1d2 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 1 Jul 2020 11:24:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=93=E5=91=98=E4=B8=9A?=
 =?UTF-8?q?=E7=BB=A9=E7=AE=A1=E7=90=86bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/AuthManagerController.class.php        | 2 +-
 .../Admin/Controller/MarketPercentageController.class.php   | 6 ++++--
 Application/Admin/Controller/TimingController.class.php     | 2 +-
 .../View/MarketPercentage/personmarketstaffsettle.html      | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/Controller/AuthManagerController.class.php b/Application/Admin/Controller/AuthManagerController.class.php
index 9f91399d0..c72fca0cf 100644
--- a/Application/Admin/Controller/AuthManagerController.class.php
+++ b/Application/Admin/Controller/AuthManagerController.class.php
@@ -624,7 +624,7 @@ class AuthManagerController extends AdminController{
             $this->assign('data',$data['market_percentage']);
             $this->assign('auth_group', $auth_group);
 
-            $this->display();
+            $this->display("authmarketmember");
         }
 
 
diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index 0487e691f..c3f143269 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -833,7 +833,9 @@ class MarketPercentageController extends ThinkController
 //            $pay_time = date("Y-m",strtotime('-1 month'));
         }
 
-        exec("php cli.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &");
+//        var_dump("php cli.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &");die();
+
+        exec("php admin.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &");
 
         $this->success('操作成功,后台正在计算中，请稍后再打开......');
     }
@@ -1040,7 +1042,7 @@ class MarketPercentageController extends ThinkController
 //            var_dump($data['config']);die();
 
             $this->assign('data',$data['config']);
-            $this->display();
+            $this->display("marketstaffsettle");
 
         }
 
diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php
index acbdffd88..98bad980c 100644
--- a/Application/Admin/Controller/TimingController.class.php
+++ b/Application/Admin/Controller/TimingController.class.php
@@ -789,7 +789,7 @@ class TimingController extends AdminController {
             ->where($spend_map)
             ->group("tab_spend.id")
             ->select(false);
-
+//        var_dump($spend);die();
         $payway_spend = M()->table("({$spend}) spend")
             ->field("sum(pay_amount) as pay_amount,pay_time,promote_id,game_name,game_id,relation_game_id,pay_way,sdk_version")
             ->where($map)
diff --git a/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html b/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html
index 628cc3cf0..fce25c938 100644
--- a/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html
+++ b/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html
@@ -121,7 +121,7 @@
                                             <option value="">请选择时间</option>
                                             <volist name="list_data" id="s_data">
                                                 <if condition="$s_data['is_send_use'] eq 1">
-                                                <option value="{$s_data['pay_time']}" data-admin_id="{$s_data.admin_id}">{$s_data['pay_time']}</option>
+                                                <option value="{$s_data['pay_time']}" data-admin_id="{$s_data.admin_id}">{$s_data['pay_time']}($data['real_name']})</option>
                                                 </if>
                                             </volist>
                                         </select>