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

groupby市场专员id添加

Application/Admin/Controller/MarketPercentageController.class.php

@@ -93,13 +93,13 @@ class MarketPercentageController extends ThinkController
 
         if ($_REQUEST['export']) {
             $data = $data->where($map)
-                ->group("promote_id,game_name,pay_time")
+                ->group("promote_id,game_name,pay_time,admin_id")
                 ->order("pay_time DESC")
                 ->select();
         } else {
             $data = $data->page($p, $row)
                 ->where($map)
-                ->group("promote_id,game_name,pay_time")
+                ->group("promote_id,game_name,pay_time,admin_id")
                 ->order("pay_time DESC")
                 ->select();
         }

Application/Admin/Controller/TimingController.class.php

@@ -914,7 +914,7 @@ class TimingController extends AdminController {
             unset($promote_data[$key]['market_percentage']);
 
             $marker_data = M("settleup_marketorder","tab_")
-                ->where(['pay_time'=>$value['pay_time'],'promote_id'=>$value['promote_id'],'game_name'=>$value['game_name']])
+                ->where(['pay_time'=>$value['pay_time'],'promote_id'=>$value['promote_id'],'game_name'=>$value['game_name'],'admin_id'=>$value['admin_id']])
                 ->find();
             echo "日期:{$value['pay_time']},游戏:{$value['game_name']},推广员:{$value['promote_account']}\n";
 //            dump($promote_data[$key]);die();
@@ -923,7 +923,7 @@ class TimingController extends AdminController {
                     ->add($promote_data[$key]);
             } else {
                 M("settleup_marketorder","tab_")
-                    ->where(['pay_time'=>$value['pay_time'],'promote_id'=>$value['promote_id'],'game_name'=>$value['game_name']])
+                    ->where(['pay_time'=>$value['pay_time'],'promote_id'=>$value['promote_id'],'game_name'=>$value['game_name'],'admin_id'=>$value['admin_id']])
                     ->save($promote_data[$key]);
             }