历史流水比例修正

master
zhengyongxing 4 years ago
parent f8a7d53ac8
commit 5c57abc794

@ -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 {

@ -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(){

@ -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(){

Loading…
Cancel
Save