Merge branch 'feature/market_percentage' of wmtx/platform into release

市场专员业绩管理bug修改

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");
         }
 
 

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");
 
         }
 

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)

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>