From 9a722d5b45b7f747dd41d5becc1276e8321ce86e Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 29 Jul 2020 14:30:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E7=BB=93=E7=AE=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MarketPercentageController.class.php | 7 ++++--- .../Admin/Controller/TimingController.class.php | 2 +- Application/Admin/View/MarketPercentage/index.html | 10 +++++++++- .../View/MarketPercentage/marketstaffsettle.html | 14 +++++++++++--- .../MarketPercentage/personmarketstaffsettle.html | 2 +- .../Admin/View/MarketPercentage/showbonuslist.html | 8 ++++++-- 6 files changed, 32 insertions(+), 11 deletions(-) diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index 63a95465f..75fd5f83e 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/Application/Admin/Controller/MarketPercentageController.class.php @@ -19,6 +19,7 @@ class MarketPercentageController extends ThinkController $_REQUEST['promote_id']?($map['promote_id'] = $_REQUEST['promote_id']):''; $_REQUEST['relation_game_id']?($map['relation_game_id'] = $_REQUEST['relation_game_id']):''; $_REQUEST['sdk_version']?($map['sdk_version'] = $_REQUEST['sdk_version']):''; + $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):''; $admin_id = $_SESSION['onethink_admin']['user_auth']['uid']; $map['admin_id'] = $admin_id; @@ -515,13 +516,13 @@ class MarketPercentageController extends ThinkController // $_REQUEST['pay_time']?($map['pay_time'] = $_REQUEST['pay_time']):''; // $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):''; $_REQUEST['group_id']?($map['group_id'] = $_REQUEST['group_id']):''; - ($_REQUEST['status']||$_REQUEST['status']=='0')?($map['status'] = $_REQUEST['status']):''; + ($_REQUEST['status']||$_REQUEST['status']=='0')?($map['tab_market_altogether.status'] = $_REQUEST['status']):''; if($_REQUEST['status']||$_REQUEST['status']=='0') { if( $_REQUEST['status'] == '1') { - $map['status'] = ['egt',1]; + $map['tab_market_altogether.status'] = ['egt',1]; } else { - $map['status'] = $_REQUEST['status']; + $map['tab_market_altogether.status'] = $_REQUEST['status']; } } diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index f8999e383..79f4dbd6a 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -785,7 +785,7 @@ class TimingController extends AdminController { CASE WHEN substring_index(substring_index(`chain`,'/',2),'/',-1) !='' THEN substring_index(substring_index(`chain`,'/',2),'/',-1) ELSE promote_id END promote_id,pay_way,market_admin_id") ->join("left join tab_promote on tab_spend.promote_id = tab_promote.id") ->join("left join tab_game game on game.id=tab_spend.game_id") - ->where(['tab_spend.pay_status'=>1,'pay_way'=>['egt',1]]) + ->where(['tab_spend.pay_status'=>1,'pay_way'=>['egt',0]]) ->where($spend_map) ->group("tab_spend.id") ->select(false); diff --git a/Application/Admin/View/MarketPercentage/index.html b/Application/Admin/View/MarketPercentage/index.html index 37be4c5df..ed2c20c86 100644 --- a/Application/Admin/View/MarketPercentage/index.html +++ b/Application/Admin/View/MarketPercentage/index.html @@ -43,7 +43,7 @@
- 重算 + 重算
@@ -77,6 +77,14 @@ +
+ +