elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master

Browse Source 
优化汇总时间显示
master
廖金灵 5 years ago committed by Gogs
parent 54f933aba1 0fd5bc7fe8
commit a05770557b
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

12
Application/Admin/Controller/CompanyStatementPoolController.class.php
Unescape Escape View File

@ -239,8 +239,8 @@ class CompanyStatementPoolController extends ThinkController
foreach($infolist as $k=>&$v){ foreach($infolist as $k=>&$v){
$v['statement_info'] = json_decode($v['statement_info'],true); $v['statement_info'] = json_decode($v['statement_info'],true);
$v['company_info'] = json_decode($v['company_info'],true); $v['company_info'] = json_decode($v['company_info'],true);
$v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']); $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']);
$v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']); $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']);
$cline = $line+1; $cline = $line+1;
if($is_export){ if($is_export){
$v['sum_money_exp'] = "="; $v['sum_money_exp'] = "=";
@ -292,8 +292,8 @@ class CompanyStatementPoolController extends ThinkController
unset($pl); unset($pl);
foreach($infolist as $k=>&$v){ foreach($infolist as $k=>&$v){
$v['statement_info'] = json_decode($v['statement_info'],true); $v['statement_info'] = json_decode($v['statement_info'],true);
$v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']); $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']);
$v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']); $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']);
$cline = $line+1; $cline = $line+1;
if($is_export){ if($is_export){
$v['statement_money_exp'] = "="; $v['statement_money_exp'] = "=";
@ -372,8 +372,8 @@ class CompanyStatementPoolController extends ThinkController
// //
foreach($infolist as $k=>&$v){ foreach($infolist as $k=>&$v){
$v['statement_info'] = json_decode($v['statement_info'],true); $v['statement_info'] = json_decode($v['statement_info'],true);
$v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']); $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']);
$v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']); $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']);
$cline = $line+1; $cline = $line+1;
if($is_export){ if($is_export){
$v['statement_money_exp'] = "="; $v['statement_money_exp'] = "=";

16
Application/Admin/Controller/CompanyStatementSetController.class.php
Unescape Escape View File

@ -255,8 +255,8 @@ class CompanyStatementSetController extends Controller {
$GameDb = M("Game","tab_"); $GameDb = M("Game","tab_");
$StatementDb = M("CompanyStatement","tab_"); $StatementDb = M("CompanyStatement","tab_");
$statement_begin_time = date("Y-m-d",$begintime); $statement_begin_time = date("Y.m.d",$begintime);
$statement_end_time = date("Y-m-d",$endtime); $statement_end_time = date("Y.m.d",$endtime);
foreach($cpList as $k=>$v){ foreach($cpList as $k=>$v){
$add_data=[]; $add_data=[];
@ -566,8 +566,8 @@ class CompanyStatementSetController extends Controller {
$verify_log=json_encode(["create_user"=>"system","create_time"=>date("Y-m-d H:i:s")]); $verify_log=json_encode(["create_user"=>"system","create_time"=>date("Y-m-d H:i:s")]);
$StatementDb = M("CompanyStatement","tab_"); $StatementDb = M("CompanyStatement","tab_");
$statement_begin_time = date("Y-m-d",$begintime); $statement_begin_time = date("Y.m.d",$begintime);
$statement_end_time = date("Y-m-d",$endtime); $statement_end_time = date("Y.m.d",$endtime);
$RewardRecord = M("RewardDetail","tab_"); $RewardRecord = M("RewardDetail","tab_");
foreach($pcList as $k=>$v){ foreach($pcList as $k=>$v){
if(!isset($pc[$k])){continue;}//不存在的公司不结算 if(!isset($pc[$k])){continue;}//不存在的公司不结算
@ -915,8 +915,8 @@ class CompanyStatementSetController extends Controller {
$this->getPromoteCompanySpend($pc,array_unique(array_keys($pc)),$begintime,$endtime); $this->getPromoteCompanySpend($pc,array_unique(array_keys($pc)),$begintime,$endtime);
$StatementDb = M("CompanyStatement","tab_"); $StatementDb = M("CompanyStatement","tab_");
$statement_begin_time = date("Y-m-d",$begintime); $statement_begin_time = date("Y.m.d",$begintime);
$statement_end_time = date("Y-m-d",$endtime); $statement_end_time = date("Y.m.d",$endtime);
// $RewardRecord = M("RewardRecord","tab_"); // $RewardRecord = M("RewardRecord","tab_");
$LackStatement = M("company_lack_statement_info","tab_"); $LackStatement = M("company_lack_statement_info","tab_");
$StatementInfo = M("company_statement_info","tab_"); $StatementInfo = M("company_statement_info","tab_");
@ -1146,8 +1146,8 @@ class CompanyStatementSetController extends Controller {
$pl = M("promote_company","tab_") $pl = M("promote_company","tab_")
->alias('pc') ->alias('pc')
->field("p.account,p.company_relation,IFNULL(s.nickname,'admin') nickname") ->field("p.account,p.company_relation,IFNULL(s.nickname,'admin') nickname")
->join("left join (select company_id,account,company_relation from tab_promote where level = 1 group by company_id ) p on p.company_id = pc.id")//获取会长 ->join("left join (select company_id,account,company_relation,admin_id from tab_promote where level = 1 group by company_id ) p on p.company_id = pc.id")//获取会长
->join("left join sys_member s on s.uid = pc.uid") ->join("left join sys_member s on s.uid = p.admin_id")
->where("pc.id = {$company_id}") ->where("pc.id = {$company_id}")
->find(); ->find();
$company = array_merge($company_info,$pl); $company = array_merge($company_info,$pl);

4
Application/Admin/View/CompanyStatementPool/viewCpPool.html
Unescape Escape View File

@ -126,7 +126,7 @@
<td rowspan="{$com.statement_count}">{$com.company_name}</td> <td rowspan="{$com.statement_count}">{$com.company_name}</td>
<td rowspan="{$com.statement_count}">{$com.matche_platform}</td> <td rowspan="{$com.statement_count}">{$com.matche_platform}</td>
<!-- <td rowspan="{$com.statement_count}">{$com.statement_begin_time} ~ {$com.statement_end_time}</td> --> <!-- <td rowspan="{$com.statement_count}">{$com.statement_begin_time} ~ {$com.statement_end_time}</td> -->
<td>{$com['statement_info'][0]['statement_begin_time']} ~ {$com['statement_info'][0]['statement_end_time']}</td> <td>{$com['statement_info'][0]['statement_begin_time']} - {$com['statement_info'][0]['statement_end_time']}</td>
<td>{$com['statement_info'][0]['game_name']}</td> <td>{$com['statement_info'][0]['game_name']}</td>
<td>{$com['statement_info'][0]['pay_amount']}</td> <td>{$com['statement_info'][0]['pay_amount']}</td>
@ -145,7 +145,7 @@
<foreach name="com.statement_info" item="it" key="k"> <foreach name="com.statement_info" item="it" key="k">
<if condition="$k neq 0"> <if condition="$k neq 0">
<tr> <tr>
<td>{$it['statement_begin_time']} ~ {$it['statement_end_time']}</td> <td>{$it['statement_begin_time']} - {$it['statement_end_time']}</td>
<td>{$it['game_name']}</td> <td>{$it['game_name']}</td>
<td>{$it['pay_amount']}</td> <td>{$it['pay_amount']}</td>
<td>{$it['pay_amount']}</td> <td>{$it['pay_amount']}</td>

4
Application/Admin/View/CompanyStatementPool/viewPcPool.html
Unescape Escape View File

@ -127,7 +127,7 @@
<td rowspan="{$com.statement_count}">{$com.reward}</td> <td rowspan="{$com.statement_count}">{$com.reward}</td>
<td rowspan="{$com.statement_count}">{$com.statement_money}</td> <td rowspan="{$com.statement_count}">{$com.statement_money}</td>
<td rowspan="{$com.statement_count}">{$com.settlement_contact}</td> <td rowspan="{$com.statement_count}">{$com.settlement_contact}</td>
<td>{$com['statement_info'][0]['statement_begin_time']} ~ {$com['statement_info'][0]['statement_end_time']}</td> <td>{$com['statement_info'][0]['statement_begin_time']} - {$com['statement_info'][0]['statement_end_time']}</td>
<td rowspan="{$com.statement_count}">{$com.renark}</td> <td rowspan="{$com.statement_count}">{$com.renark}</td>
</tr> </tr>
@ -140,7 +140,7 @@
<td>{$it['increment_ratio']}%</td> <td>{$it['increment_ratio']}%</td>
<td>{$it['fax_ratio']}%</td> <td>{$it['fax_ratio']}%</td>
<td>{$it['d_statement_money']}</td> <td>{$it['d_statement_money']}</td>
<td>{$it['statement_begin_time']} ~ {$it['statement_end_time']}</td> <td>{$it['statement_begin_time']} - {$it['statement_end_time']}</td>
</tr> </tr>
</if> </if>
</foreach> </foreach>

4
Application/Admin/View/CompanyStatementPool/viewPuPool.html
Unescape Escape View File

@ -143,7 +143,7 @@
<td>{$com['statement_info'][0]['game_name']}</td> <td>{$com['statement_info'][0]['game_name']}</td>
<td>{$com['statement_info'][0]['game_type_name']}</td> <td>{$com['statement_info'][0]['game_type_name']}</td>
<td>{$com['statement_info'][0]['statement_begin_time']} ~ {$com['statement_info'][0]['statement_end_time']}</td> <td>{$com['statement_info'][0]['statement_begin_time']} - {$com['statement_info'][0]['statement_end_time']}</td>
<td>{$com['statement_info'][0]['pay_amount']}</td> <td>{$com['statement_info'][0]['pay_amount']}</td>
<if condition="$com['statement_info'][0]['statement_type'] neq 0"> <if condition="$com['statement_info'][0]['statement_type'] neq 0">
<td></td> <td></td>
@ -188,7 +188,7 @@
<tr> <tr>
<td>{$it['game_name']}</td> <td>{$it['game_name']}</td>
<td>{$it['game_type_name']}</td> <td>{$it['game_type_name']}</td>
<td>{$it['statement_begin_time']} ~ {$it['statement_end_time']}</td> <td>{$it['statement_begin_time']} - {$it['statement_end_time']}</td>
<td>{$it['pay_amount']}</td> <td>{$it['pay_amount']}</td>
<if condition="$it['statement_type'] neq 0"> <if condition="$it['statement_type'] neq 0">

Write Preview
Loading…
Cancel
Save