From 5c57abc79423881f9313583755a0e750f5175f04 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Fri, 23 Oct 2020 15:21:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=B5=81=E6=B0=B4=E6=AF=94?=
 =?UTF-8?q?=E4=BE=8B=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyStatementSetController.class.php  | 4 +++-
 .../Admin/View/MarketPercentage/addcompanybelonggame.html     | 4 ++--
 .../Admin/View/MarketPercentage/editcompanybelonggame.html    | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php
index 55b2f2035..1e2ba55b2 100644
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@@ -1084,7 +1084,7 @@ class CompanyStatementSetController extends Controller {
             $all_list =  $Spend
                 ->alias('s')
                 ->field("sum(s.pay_amount) pay_amount,s.game_id,g.relation_game_id,g.relation_game_name game_name,IFNULL(if(substring_index(substring_index(promote.`chain`,'/',2),'/',-1)='',s.promote_id,substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) p_id")
-                ->where($spenMap)
+                ->where($all_spendMap)
                 ->group('p_id,game_id')
                 ->join("tab_promote promote ON s.promote_id = promote.id","left")
                 ->join("left join tab_game g on s.game_id = g.id")
@@ -1113,11 +1113,13 @@ class CompanyStatementSetController extends Controller {
 			$game_ids = implode(",",array_keys($game));
 			$game_ids = $this->getModuleRatioGame($company_id,$game_ids,$begintime,$endtime);
 			$sameGame =  $this->getTheSameGame($game_ids);
+
 			if(!empty($sameGame)){
 				foreach ($sameGame as $k => $v) {
 					$temp = 0;
 					for ($j=0; $j < count($v); $j++) {
                         $turnover_type = $this->getTurnoverType($v[$j],$company_id,$begintime,$endtime);
+
                         if ($turnover_type == 2) {
                             $temp += $allgame[$v[$j]]['pay_amount'];
                         } else {
diff --git a/Application/Admin/View/MarketPercentage/addcompanybelonggame.html b/Application/Admin/View/MarketPercentage/addcompanybelonggame.html
index 3e9ed3648..edf77341e 100644
--- a/Application/Admin/View/MarketPercentage/addcompanybelonggame.html
+++ b/Application/Admin/View/MarketPercentage/addcompanybelonggame.html
@@ -115,7 +115,7 @@
 						<tr>
 							<td class="l"><i class="mustmark">*</i>游戏:</td>
 							<td class="r">
-								<a class="ajax-view" data-id="{$data.id}">选择游戏</a>
+								<a class="ajax-view submit_btn mlspacing" data-id="{$data.id}" style="margin-left:0">选择游戏</a>
 								<span class="notice-text"></span>
 							</td>
 						</tr>
@@ -218,7 +218,7 @@
 	<script src="__STATIC__/czinputcheck.js?v=1.29" type="text/javascript"></script>
 	<script type="text/javascript">
 		//导航高亮
-		highlight_subnav("{:U('index')}");
+		highlight_subnav("{:U('addcompanybelonggame')}");
 		$(".select_gallery").select2();
 
 		$(function(){
diff --git a/Application/Admin/View/MarketPercentage/editcompanybelonggame.html b/Application/Admin/View/MarketPercentage/editcompanybelonggame.html
index 2aceabcda..a8c93171e 100644
--- a/Application/Admin/View/MarketPercentage/editcompanybelonggame.html
+++ b/Application/Admin/View/MarketPercentage/editcompanybelonggame.html
@@ -115,7 +115,7 @@
 						<tr>
 							<td class="l"><i class="mustmark">*</i>游戏:</td>
 							<td class="r">
-								<a class="ajax-view" data-id="{$data.id}">选择游戏</a>
+								<a class="ajax-view submit_btn mlspacing" data-id="{$data.id}" style="margin-left:0">选择游戏</a>
 								<span class="notice-text"></span>
 							</td>
 						</tr>
@@ -219,7 +219,7 @@
 	<script src="__STATIC__/czinputcheck.js?v=1.29" type="text/javascript"></script>
 	<script type="text/javascript">
 		//导航高亮
-		highlight_subnav("{:U('index')}");
+		highlight_subnav("{:U('editcompanybelonggame')}");
 		$(".select_gallery").select2();
 
 		$(function(){