diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index 3666deff8..eb0c4a9c6 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -254,6 +254,7 @@ class CompanyStatementPoolController extends ThinkController
public function editPuPool(&$infolist,$is_export) {
$line = 1;
$count = [];
+ $week_line = 2;
//获取对接人
foreach($infolist as $k=>&$v){
$v['statement_info'] = json_decode($v['statement_info'],true);
@@ -318,6 +319,11 @@ class CompanyStatementPoolController extends ThinkController
}
}
}
+
+ $handle_data = $this->changeDataStruct($v['statement_info'],$is_export,$week_line);
+
+ $v['statement_info'] = $handle_data;
+
$v['row'] = $row;
if($is_export){
if($v['withdraw_type'] != 3) {
@@ -342,6 +348,8 @@ class CompanyStatementPoolController extends ThinkController
public function viewPuPool(&$infolist,$is_export){
$line = 1;
$count = [];
+ $week_line = 2;
+
//获取对接人
foreach($infolist as $k=>&$v){
$v['statement_info'] = json_decode($v['statement_info'],true);
@@ -398,6 +406,11 @@ class CompanyStatementPoolController extends ThinkController
}
}
}
+
+ $handle_data = $this->changeDataStruct($v['statement_info'],$is_export,$week_line);
+
+ $v['statement_info'] = $handle_data;
+
$v['row'] = $row;
if($is_export){
if($v['withdraw_type'] != 3) {
@@ -412,13 +425,140 @@ class CompanyStatementPoolController extends ThinkController
$count["platform_amount"] = "=ROUND(SUM(K2:K".$line."),2)";
$count["sum_money"] = "=ROUND(SUM(R2:R".$line."),2)";
}
+// die();
$this->assign("data",$infolist);
$this->assign("count",$count);
$this->assign("is_export",$is_export);
$this->display("CompanyStatementPool/viewPuPool");
}
+ //改变结构
+ public function changeDataStruct($statement_info = [],$is_export = 0,&$week_line = 1) {
+
+ $game_list = [];
+ $old_line = $week_line;
+
+ //使用时间与会长账号作为键值分离数据
+ foreach($statement_info as $sk=>$sv){
+
+ foreach($sv['game_list'] as $gk=>$gv){
+
+ $gv['account'] = $sv['account'];
+ $game_list[$gv['statement_begin_time'].'-'.$gv['statement_end_time']][$gv['account']][] = $gv;
+
+ }
+
+ }
+
+ $game_data = [];
+ $handle_data = [];
+ //处理游戏金额数据
+ foreach($game_list as $gk => $gv) {
+
+ foreach ($gv as $sk => $sv) {
+ $game_data['account'] = $sk;
+ $game_data['row'] = count($sv);
+ $game_data['time_row'] = count($sv);
+ $game_data['time'] = $gk;
+ //周结算金额计算
+ for ($i=0;;$i++) {
+ if ($sv[$i]['sum_money']) {
+ $game_data['week_amount'] += $sv[$i]['sum_money'];
+ } else {
+ break;
+ }
+
+ }
+// $game_data['week_amount'] += $sv[0]['sum_money'];
+
+ $game_data['game_list'] = $sv;
+ array_push($handle_data,$game_data);
+ $game_data = [];
+
+ }
+
+ }
+ $substract = 1;
+// dump($game_list);
+// dump($handle_data);
+ //添加周结算金额，合并相同的结算时间
+// dump($handle_data);
+ foreach($handle_data as $hk => $hv) {
+
+ if($hk > 0) {
+ for (;;) {
+
+ if (!$handle_data[$hk-$substract]['time']) {
+ $substract++;
+ } else {
+ break;
+ }
+
+ }
+// dump($hv);
+ if ($hv['time'] == $handle_data[$hk-$substract]['time']&&!$is_export) {
+
+ $handle_data[$hk-$substract]['time_row'] += $handle_data[$hk]['time_row'];
+
+ if ($is_export) {
+
+ $week_line++;
+ $handle_data[$hk-$substract]['week_amount'] = "=ROUND(SUM(O{$old_line}:O{$week_line}),2)";
+ $old_line++;
+ } else {
+ $handle_data[$hk-$substract]['week_amount'] += $handle_data[$hk]['week_amount'];
+ }
+
+ unset($handle_data[$hk]['time']);
+ unset($handle_data[$hk]['time_row']);
+ unset($handle_data[$hk]['week_amount']);
+ } else {
+ if ($is_export) {
+// dump($old_line);
+ if (count($hv['game_list'])>1) {
+ $week_line += count($hv['game_list'])-1;
+ }
+
+ $handle_data[$hk]['week_amount'] = "=ROUND(SUM(O{$old_line}:O{$week_line}),2)";
+ $old_line++;
+ $week_line++;
+ }
+ }
+ $substract = 1;
+ }else {
+ if ($is_export) {
+
+ if (count($hv['game_list'])>1) {
+ $week_line += count($hv['game_list'])-1;
+ }
+
+ $handle_data[$hk]['week_amount'] = "=ROUND(SUM(O{$old_line}:O{$week_line}),2)";
+
+
+ if (count($hv['game_list'])>1) {
+ $old_line += count($hv['game_list'])-1;
+ } else {
+ $old_line++;
+ }
+
+
+ if(count($hv['game_list'])>1) {
+
+ $week_line = $old_line + 1;
+ } else {
+ $week_line = $old_line;
+ }
+
+ }
+ }
+
+ }
+// dump($handle_data);
+ return $handle_data?$handle_data:[];
+ }
+
//下游汇总结算查看
public function viewPcPool(&$infolist,$is_export){
+
$line = 1;
$count = [];
//获取对接人
@@ -458,9 +598,9 @@ class CompanyStatementPoolController extends ThinkController
if($is_export){
if($v['withdraw_type'] != 3) {
- $va['d_statement_money'] = "=ROUND(D{$line}*(1-G{$line})*(E{$line}+F{$line}),2)";
+ $va['d_statement_money'] = "=ROUND(E{$line}*(1-H{$line})*(F{$line}+G{$line}),2)";
} else {
- $va['d_statement_money'] = "=ROUND(D{$line}*(F{$line}),2)";
+ $va['d_statement_money'] = "=ROUND(E{$line}*(G{$line}),2)";
}
}else{
if ($v['withdraw_type'] != 3) {
@@ -478,14 +618,67 @@ class CompanyStatementPoolController extends ThinkController
}
}
}
+
+
+// $game_list = [];
+// $statement_info = $v['statement_info'];
+// //使用时间与会长账号作为键值分离数据
+// foreach($statement_info as $sk=>$sv){
+//
+// $sv['time'] = $sv['statement_begin_time'].'-'.$sv['statement_end_time'];
+// $game_list[$sv['statement_begin_time'].'-'.$sv['statement_end_time']][] = $sv;
+//
+// }
+//
+// $handle_data = [];
+// $substract = 1;
+//
+// //处理游戏金额数据
+// foreach($game_list as $gk => $gv) {
+//
+// foreach ($gv as $lk => $lv){
+//
+// if ($lk > 0) {
+//
+// for (;;) {
+//
+// if (!$handle_data[$lk-$substract]['time']) {
+// $substract++;
+// } else {
+// $handle_data[$lk-$substract]['row'] += 1;
+// $handle_data[$lk-$substract]['week_amount'] += $lv['d_statement_money'];
+// unset($lv['time']);
+// break;
+// }
+//
+// }
+//
+// } else {
+//
+// $lv['row'] = 1;
+// $lv['week_amount'] = $lv['d_statement_money'];
+// }
+//
+// array_push($handle_data,$lv);
+//
+// }
+//
+// }
+//
+ $handle_data = $this->changeDataStructVc($v['statement_info'],$is_export,$cline);
+ $v['statement_info'] = $handle_data;
+// dump($handle_data);
+
+
+
$v['settlement_contact'] = $Partner[$v['company_id']];
if($is_export){
+
if ($v['withdraw_type'] != 3) {
- $v['statement_money'] = "=ROUND(SUM(H{$cline}:H{$line})+J{$cline}-I{$cline},2)";
+ $v['statement_money'] = "=ROUND(SUM(I{$cline}:I{$line})+K{$cline}-J{$cline},2)";
}
-
}else{
$count['fine'] += $v['fine'];
$count['reward'] += $v['reward'];
@@ -495,11 +688,11 @@ class CompanyStatementPoolController extends ThinkController
}
if($is_export){
- $count["platform_amount"] = "=ROUND(SUM(D2:D".$line."),2)";
- $count["d_statement_money"] = "=ROUND(SUM(H2:H".$line."),2)";
- $count["fine"] = "=ROUND(SUM(I2:I".$line."),2)";
- $count["reward"] = "=ROUND(SUM(J2:J".$line."),2)";
- $count["statement_money"] = "=ROUND(SUM(K2:K".$line."),2)";
+ $count["platform_amount"] = "=ROUND(SUM(E2:E".$line."),2)";
+ $count["d_statement_money"] = "=ROUND(SUM(I2:I".$line."),2)";
+ $count["fine"] = "=ROUND(SUM(J2:J".$line."),2)";
+ $count["reward"] = "=ROUND(SUM(K2:K".$line."),2)";
+ $count["statement_money"] = "=ROUND(SUM(M2:M".$line."),2)";
}
// dd($infolist);
$this->assign("data",$infolist);
@@ -509,6 +702,65 @@ class CompanyStatementPoolController extends ThinkController
}
+ public function changeDataStructVc($statement_info,$is_export = 0,$cline) {
+ $game_list = [];
+ $nline = $cline;
+
+ //使用时间与会长账号作为键值分离数据
+ foreach($statement_info as $sk=>$sv){
+
+ $sv['time'] = $sv['statement_begin_time'].'-'.$sv['statement_end_time'];
+ $game_list[$sv['statement_begin_time'].'-'.$sv['statement_end_time']][] = $sv;
+
+ }
+
+ $handle_data = [];
+ $substract = 1;
+
+ //处理游戏金额数据
+ foreach($game_list as $gk => $gv) {
+
+ foreach ($gv as $lk => $lv){
+
+ if ($lk > 0) {
+
+ for (;;) {
+
+ if (!$handle_data[$lk-$substract]['time']) {
+ $nline++;
+ $substract++;
+ } else {
+ $handle_data[$lk-$substract]['row'] += 1;
+ $handle_data[$lk-$substract]['week_amount'] += $lv['d_statement_money'];
+
+ if ($is_export) {
+ $handle_data[$lk-$substract]['week_amount'] = "=ROUND(SUM(I{$cline}:I{$nline}),2)";
+ }
+ unset($lv['time']);
+ break;
+ }
+
+ }
+
+ } else {
+
+ $lv['row'] = 1;
+ $lv['week_amount'] = $lv['d_statement_money'];
+ $nline++;
+ if ($is_export) {
+ $lv['week_amount'] = "=ROUND(SUM(I{$cline}}:I{$nline}),2)";
+ }
+ }
+
+ array_push($handle_data,$lv);
+
+ }
+
+ }
+
+ return $handle_data;
+ }
+
//上游汇总查看及导出
public function viewCpPool(&$infolist,$is_export)
{
@@ -538,6 +790,8 @@ class CompanyStatementPoolController extends ThinkController
}
}
+// dump($v['statement_info']);
+
$cline = $line+1;
foreach($v['statement_info'] as $ke=>&$va){
$line ++;
@@ -551,6 +805,11 @@ class CompanyStatementPoolController extends ThinkController
$count['d_statement_money'] += $va['d_statement_money'];
}
}
+
+ $handle_data = $this->changeDataStructVc($v['statement_info'],$is_export,$cline);
+ $v['statement_info'] = $handle_data;
+// dump($v['statement_info']);
+
$v['matche_platform'] = $Partner[$v['company_id']];
if($is_export){
$v['statement_money'] = "=ROUND(SUM(K{$cline}:K{$line})+M{$cline}-L{$cline},2)";
diff --git a/Application/Admin/View/CompanyStatementPool/editPuPool.html b/Application/Admin/View/CompanyStatementPool/editPuPool.html
index 660bf6d40..4fe2bfefb 100644
--- a/Application/Admin/View/CompanyStatementPool/editPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/editPuPool.html
@@ -103,6 +103,7 @@
<tr>
<th>序号</th>
<th>下游名称</th>
+ <th>结算时间</th>
<th>会长账号</th>
<th>内外团</th>
@@ -112,7 +113,7 @@
<th>下游性质</th>
<th>产品</th>
<th>产品类型</th>
- <th>结算时间</th>
+<!-- <th>结算时间</th>-->
<th>推广流水</th>
<th>退款</th>
<th>分成比例</th>
@@ -120,6 +121,7 @@
<th>分成结算金额</th>
<th>奖励</th>
<th>罚款</th>
+ <th>周结算金额</th>
<th>结算金额</th>
<th>户名</th>
@@ -145,6 +147,7 @@
<!-- <td rowspan="{$com.statement_count}">{$com.company_info.account}</td> -->
<notempty name="com['statement_info']">
+ <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['time']}</td>
<td rowspan="{$com['statement_info'][0]['row']}" >{$com['statement_info'][0]['account']}</td>
<else />
<td>-</td>
@@ -159,7 +162,7 @@
<notempty name="com['statement_info'][0]['game_list']">
<td>{$com['statement_info'][0]['game_list'][0]['game_name']}</td>
<td>{$com['statement_info'][0]['game_list'][0]['game_type_name']}</td>
- <td>{$com['statement_info'][0]['game_list'][0]['statement_begin_time']}-{$com['statement_info'][0]['game_list'][0]['statement_end_time']}</td>
+<!-- <td>{$com['statement_info'][0]['game_list'][0]['statement_begin_time']}-{$com['statement_info'][0]['game_list'][0]['statement_end_time']}</td>-->
<td><span class="pay_amount">{$com['statement_info'][0]['game_list'][0]['pay_amount']}</span></td>
<td><input class="refund" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$com['statement_info'][0]['game_list'][0]['refund']|default=0}" style="width: 40px;" name="refund[{$com['id']}][{$com['statement_info'][0]['account']}][]"></td>
<td><input class="ratio" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}" name="ratio[{$com['id']}][{$com['statement_info'][0]['account']}][]" value="{$com['statement_info'][0]['game_list'][0]['ratio']}" style="width: 25px;">%</td>
@@ -169,6 +172,7 @@
<input class="st" name="st[{$com['id']}]" value="{$com['st']}" style="width: 20px;display: none"></td>
<td rowspan="{$com.row}">{$com['reward']}</td>
<td rowspan="{$com.row}">{$com['fine']}</td>
+ <td rowspan="{$com['statement_info'][0]['time_row']}" class="week_amount">{$com['statement_info'][0]['week_amount']}</td>
<td rowspan="{$com.row}" data-st="{$com['st']}" class="statement_money">{$com['statement_money']}</td>
<else />
@@ -179,6 +183,7 @@
<td>-</td>
<td>-</td>
<td>-</td>
+ <td>-</td>
<td rowspan="{$com.row}">-</td>
<td rowspan="{$com.row}">-</td>
<td rowspan="{$com.row}">-</td>
@@ -216,7 +221,7 @@
<tr>
<td>{$game['game_name']}</td>
<td>{$game['game_type_name']}</td>
- <td>{$game['statement_begin_time']}-{$game['statement_end_time']}</td>
+<!-- <td>{$game['statement_begin_time']}-{$game['statement_end_time']}</td>-->
<td><span class="pay_amount">{$game['pay_amount']}</span></td>
<td><input class="refund" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$game['refund']|default=0}" style="width: 40px;" name="refund[{$com['id']}][{$com['statement_info'][0]['account']}][]"></td>
<td><input class="ratio" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}" name="ratio[{$com['id']}][{$com['statement_info'][0]['account']}][]" value="{$game['ratio']}" style="width: 25px;">%</td>
@@ -234,12 +239,15 @@
<foreach name="com['statement_info']" item="account" key="akey">
<if condition="$akey gt 0">
<tr>
+ <notempty name="account['time']">
+ <td rowspan="{$account['time_row']}">{$account['time']}</td>
+ </notempty>
<td rowspan="{$account['row']}" class="accounts">{$account['account']}</td>
<notempty name="account['game_list']">
<td>{$account['game_list'][0]['game_name']}</td>
<td>{$account['game_list'][0]['game_type_name']}</td>
- <td>{$account['game_list'][0]['statement_begin_time']}-{$account['game_list'][0]['statement_end_time']}</td>
+<!-- <td>{$account['game_list'][0]['statement_begin_time']}-{$account['game_list'][0]['statement_end_time']}</td>-->
<td><span class="pay_amount">{$account['game_list'][0]['pay_amount']}</span></td>
<!-- <td>{$account['game_list'][0]['ratio']|showNumPercent}</td>-->
<!-- <td>{$account['game_list'][0]['increment_ratio']|showNumPercent}</td>-->
@@ -247,7 +255,9 @@
<td><input class="ratio" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}" name="ratio[{$com['id']}][{$account['account']}][]" value="{$account['game_list'][0]['ratio']}" style="width: 25px;">%</td>
<td><input class="increment_ratio" onkeyup ="if(value>100){value=100}else{value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')}if(value.indexOf(0)==0){value=0}" name="increment_ratio[{$com['id']}][{$account['account']}][]" value="{$account['game_list'][0]['increment_ratio']}" style="width: 25px;">%</td>
<td><span class="sum_money_span">{$account['game_list'][0]['sum_money']}</span><input class="sum_money" name="sum_money[{$com['id']}][{$account['account']}][]" value="{$account['game_list'][0]['sum_money']}" style="width: 20px;display: none"></td>
-
+ <notempty name="account['time']">
+ <td rowspan="{$account['time_row']}" class="week_amount">{$account['week_amount']}</td>
+ </notempty>
<else />
<td>-</td>
<td>-</td>
@@ -256,6 +266,7 @@
<td>-</td>
<td>-</td>
<td>-</td>
+ <td>-</td>
</notempty>
</tr>
@@ -265,7 +276,7 @@
<tr>
<td>{$game['game_name']}</td>
<td>{$game['game_type_name']}</td>
- <td>{$game['statement_begin_time']}-{$game['statement_end_time']}</td>
+<!-- <td>{$game['statement_begin_time']}-{$game['statement_end_time']}</td>-->
<td><span class="pay_amount">{$game['pay_amount']}</span></td>
<!-- <td>{$game['ratio']|showNumPercent}</td>-->
<!-- <td>{$game['increment_ratio']|showNumPercent}</td>-->
diff --git a/Application/Admin/View/CompanyStatementPool/viewCpPool.html b/Application/Admin/View/CompanyStatementPool/viewCpPool.html
index 0ce64f331..7b37383a1 100644
--- a/Application/Admin/View/CompanyStatementPool/viewCpPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewCpPool.html
@@ -111,6 +111,7 @@
<th rowspan="2" style="border-right: solid 1px #b6cad2;">合作方待结算分成</th>
<th rowspan="2" style="border-right: solid 1px #b6cad2;">违规罚款</th>
<th rowspan="2" style="border-right: solid 1px #b6cad2;">奖励</th>
+ <th rowspan="2" style="border-right: solid 1px #b6cad2;">周结算金额</th>
<th rowspan="2" style="border-right: solid 1px #b6cad2;">合作待结算金额</th>
<th rowspan=2 style="border-right: solid 1px #b6cad2;">是否结算</th>
@@ -139,7 +140,8 @@
<td rowspan="{$com.statement_count}">{$com.company_name}</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>{$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']}</td>
+ <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['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]['pay_amount']}</td>
@@ -152,6 +154,7 @@
<td rowspan="{$com.statement_count}">{$com['fine']-0}</td>
<td rowspan="{$com.statement_count}">{$com['reward']-0}</td>
+ <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['week_amount']}</td>
<td rowspan="{$com.statement_count}">{$com['statement_money']}</td>
<td rowspan="{$com.statement_count}"><if condition="$com['st'] eq 0">否 <else /> 是 </if></td>
@@ -184,7 +187,10 @@
<foreach name="com.statement_info" item="it" key="k">
<if condition="$k neq 0">
<tr>
- <td>{$it['statement_begin_time']}-{$it['statement_end_time']}</td>
+<!-- <td>{$it['statement_begin_time']}-{$it['statement_end_time']}</td>-->
+ <notempty name="it['time']">
+ <td rowspan="{$it['row']}">{$it['time']}</td>
+ </notempty>
<td>{$it['game_name']}</td>
<td>{$it['pay_amount']}</td>
<td>{$it['pay_amount']}</td>
diff --git a/Application/Admin/View/CompanyStatementPool/viewPcPool.html b/Application/Admin/View/CompanyStatementPool/viewPcPool.html
index 62c6f57db..01a4a7da5 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPcPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPcPool.html
@@ -98,6 +98,7 @@
<tr>
<th>序号</th>
<th>公司名称</th>
+ <th>结算日期</th>
<th>合作产品名称</th>
<th>平台总额(元)</th>
<th>下游内团分成比例</th>
@@ -106,11 +107,10 @@
<th>分成金额/元</th>
<th>罚款</th>
<th>奖励</th>
+ <th>周结算金额</th>
<th>合计/元</th>
<th>对账人</th>
- <th>结算日期</th>
-
-
+<!-- <th>结算日期</th>-->
<th>户名</th>
<th>帐号</th>
<th>开户行</th>
@@ -128,6 +128,7 @@
<tr>
<td rowspan="{$com.statement_count}">{$key-0+1}</td>
<td rowspan="{$com.statement_count}">{$com.company_name}</td>
+ <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['time']}</td>
<td>{$com['statement_info'][0]['game_name']}</td>
<td>{$com['statement_info'][0]['pay_amount']}</td>
<td>{$com['statement_info'][0]['ratio']|showNumPercent}</td>
@@ -136,9 +137,10 @@
<td>{$com['statement_info'][0]['d_statement_money']}</td>
<td rowspan="{$com.statement_count}">{$com['fine']-0}</td>
<td rowspan="{$com.statement_count}">{$com['reward']-0}</td>
+ <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['week_amount']}</td>
<td rowspan="{$com.statement_count}">{$com['statement_money']}</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>-->
<if condition="$com['is_payment'] eq 2">
@@ -169,19 +171,22 @@
<foreach name="com.statement_info" item="it" key="k">
<if condition="$k neq 0">
<tr>
+ <notempty name="it['time']">
+ <td rowspan="{$it['row']}">{$it['time']}</td>
+ </notempty>
<td>{$it['game_name']}</td>
<td>{$it['pay_amount']}</td>
<td>{$it['ratio']|showNumPercent}</td>
<td>{$it['increment_ratio']|showNumPercent}</td>
<td>{$it['fax_ratio']|showNumPercent}</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>
</if>
</foreach>
</foreach>
<tr>
- <td colspan=3 >合计:</td>
+ <td colspan=4 >合计:</td>
<td>{$count.platform_amount}</td>
<td></td>
<td></td>
@@ -190,6 +195,7 @@
<td>{$count.fine}</td>
<td>{$count.reward}</td>
<td>{$count.statement_money}</td>
+ <td>{$count.statement_money}</td>
<td></td>
<td></td>
<td></td>
diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
index ab815655d..5a406fb39 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
@@ -101,6 +101,7 @@
<tr>
<th>序号</th>
<th>下游名称</th>
+ <th>结算时间</th>
<th>会长账号</th>
<th>内外团</th>
@@ -110,7 +111,7 @@
<th>下游性质</th>
<th>产品</th>
<th>产品类型</th>
- <th>结算时间</th>
+<!-- <th>结算时间</th>-->
<th>推广流水</th>
<th>退款</th>
<th>分成比例</th>
@@ -118,6 +119,7 @@
<th>分成结算金额</th>
<th>奖励</th>
<th>罚款</th>
+ <th>周结算金额</th>
<th>结算金额</th>
<th>户名</th>
@@ -143,6 +145,7 @@
<!-- <td rowspan="{$com.statement_count}">{$com.company_info.account}</td> -->
<notempty name="com['statement_info']">
+ <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['time']}</td>
<td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['account']}</td>
<else />
<td>-</td>
@@ -157,7 +160,7 @@
<notempty name="com['statement_info'][0]['game_list']">
<td>{$com['statement_info'][0]['game_list'][0]['game_name']}</td>
<td>{$com['statement_info'][0]['game_list'][0]['game_type_name']}</td>
- <td>{$com['statement_info'][0]['game_list'][0]['statement_begin_time']}-{$com['statement_info'][0]['game_list'][0]['statement_end_time']}</td>
+<!-- <td>{$com['statement_info'][0]['game_list'][0]['statement_begin_time']}-{$com['statement_info'][0]['game_list'][0]['statement_end_time']}</td>-->
<td><span class="pay_amount">{$com['statement_info'][0]['game_list'][0]['pay_amount']}</span></td>
<td>{$com['statement_info'][0]['game_list'][0]['refund']|default=0}</td>
<td>{$com['statement_info'][0]['game_list'][0]['ratio']}%</td>
@@ -165,6 +168,7 @@
<td><span class="sum_money_span">{$com['statement_info'][0]['game_list'][0]['sum_money']}</span></td>
<td rowspan="{$com.row}">{$com['reward']}</td>
<td rowspan="{$com.row}">{$com['fine']}</td>
+ <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['week_amount']}</td>
<td rowspan="{$com.row}">{$com['statement_money']}</td>
<else />
@@ -175,6 +179,7 @@
<td>-</td>
<td>-</td>
<td>-</td>
+ <td>-</td>
<td rowspan="{$com.row}">-</td>
<td rowspan="{$com.row}">-</td>
<td rowspan="{$com.row}">-</td>
@@ -212,7 +217,7 @@
<tr>
<td>{$game['game_name']}</td>
<td>{$game['game_type_name']}</td>
- <td>{$game['statement_begin_time']}-{$game['statement_end_time']}</td>
+<!-- <td>{$game['statement_begin_time']}-{$game['statement_end_time']}</td>-->
<td><span class="pay_amount">{$game['pay_amount']}</span></td>
<td>{$game['refund']|default=0}</td>
<td>{$game['ratio']}%</td>
@@ -230,12 +235,15 @@
<foreach name="com['statement_info']" item="account" key="akey">
<if condition="$akey gt 0">
<tr>
+ <notempty name="account['time']">
+ <td rowspan="{$account['time_row']}">{$account['time']}</td>
+ </notempty>
<td rowspan="{$account['row']}">{$account['account']}</td>
<notempty name="account['game_list']">
<td>{$account['game_list'][0]['game_name']}</td>
<td>{$account['game_list'][0]['game_type_name']}</td>
- <td>{$account['game_list'][0]['statement_begin_time']}-{$account['game_list'][0]['statement_end_time']}</td>
+<!-- <td>{$account['game_list'][0]['statement_begin_time']}-{$account['game_list'][0]['statement_end_time']}</td>-->
<td><span class="pay_amount">{$account['game_list'][0]['pay_amount']}</span></td>
<!-- <td>{$account['game_list'][0]['ratio']|showNumPercent}</td>-->
<!-- <td>{$account['game_list'][0]['increment_ratio']|showNumPercent}</td>-->
@@ -243,6 +251,9 @@
<td>{$account['game_list'][0]['ratio']}%</td>
<td>{$account['game_list'][0]['increment_ratio']}%</td>
<td><span class="sum_money_span">{$account['game_list'][0]['sum_money']}</span></td>
+ <notempty name="account['time']">
+ <td rowspan="{$account['time_row']}">{$account['week_amount']}</td>
+ </notempty>
<else />
<td>-</td>
@@ -252,6 +263,7 @@
<td>-</td>
<td>-</td>
<td>-</td>
+ <td>-</td>
</notempty>
</tr>
@@ -261,7 +273,7 @@
<tr>
<td>{$game['game_name']}</td>
<td>{$game['game_type_name']}</td>
- <td>{$game['statement_begin_time']}-{$game['statement_end_time']}</td>
+<!-- <td>{$game['statement_begin_time']}-{$game['statement_end_time']}</td>-->
<td><span class="pay_amount">{$game['pay_amount']}</span></td>
<!-- <td>{$game['ratio']|showNumPercent}</td>-->
<!-- <td>{$game['increment_ratio']|showNumPercent}</td>-->
@@ -290,6 +302,7 @@
<td></td>
<td></td>
<td>{$count.sum_money}</td>
+ <td>{$count.sum_money}</td>
<td></td>
<td></td>
<td></td>