From 5ea0f2157472bf7623f1b6db408f1ba4d078b96f Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 8 Jul 2020 14:37:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?groupby=E5=B8=82=E5=9C=BA=E4=B8=93=E5=91=98?=
 =?UTF-8?q?id=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/MarketPercentageController.class.php     | 4 ++--
 Application/Admin/Controller/TimingController.class.php       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index 13d73fb09..427de2b99 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/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();
         }
diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php
index a4c97c60a..f8999e383 100644
--- a/Application/Admin/Controller/TimingController.class.php
+++ b/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]);
             }
 

From fd926a0795cf1faf2d04895c9b7a79e4735cb4c5 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 8 Jul 2020 16:31:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9D=A1=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/MarketPercentageController.class.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index 427de2b99..0c01e5d05 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -169,7 +169,7 @@ class MarketPercentageController extends ThinkController
 
         $count = M("settleup_marketorder","tab_")
             ->where($map)
-            ->group("promote_id,game_name,pay_time")
+            ->group("promote_id,game_name,pay_time,admin_id")
             ->select(false);
 
         $count = M()->table("({$count}) count")->count();