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

Merge branch 'hotfix/bug_repair' of wmtx/platform into release

Browse Source 
不结算bug修改
master
郑永星 4 years ago committed by Gogs
parent 932900b4c9 9bec07c7d4
commit c546821310
3 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

@ -1332,6 +1332,7 @@ class CompanyStatementPoolController extends ThinkController
"statement_pool_num"=>$pool['statement_num'],
"statement_info"=>$v['statement_info'],
"withdraw_type"=>$v['withdraw_type'],
"remark"=>$v["remark"],
];
$l_id = M("company_lack_statement_info","tab_")->add($lackcompany);
@ -1711,6 +1712,7 @@ class CompanyStatementPoolController extends ThinkController
$lfine = 0;
$handledata = [];
// dump($st);die();
foreach ($increment_ratio as $key => $value) {
@ -1766,7 +1768,6 @@ class CompanyStatementPoolController extends ThinkController
$statement_amount += $sum_money[$key][$v['account']][$gk]-$statement_info[$k]['game_list'][$gk]['withhold'];
} else {
$statement_lack_amount += $sum_money[$key][$v['account']][$gk]-$statement_info[$k]['game_list'][$gk]['withhold'];
}
}
@ -1784,7 +1785,7 @@ class CompanyStatementPoolController extends ThinkController
$lfine += $r_data['fine'];
}
$model->where(['id'=>$key])->save(['statement_info'=>$statement_info_data,'statement_money'=>$amount+($r_data['reward']?$r_data['reward']:0)-($r_data['fine']?$r_data['fine']:0),'pay_amount'=>$amount,'remark'=>$remark[$key]]);
$model->where(['id'=>$key])->save(['statement_info'=>$statement_info_data,'statement_money'=>$amount+($r_data['reward']?$r_data['reward']:0)-($r_data['fine']?$r_data['fine']:0),'pay_amount'=>$amount,'remark'=>$remark[$key][$st[$key][$akey]]]);
$amount = 0;

17
Application/Admin/Controller/OldCountController.class.php
Unescape Escape View File

@ -12,7 +12,7 @@ class OldCountController extends \Think\Controller
public function oldRewardChange() {
$data = M("company_statement_info","tab_")
$data = M("company_lack_statement_info","tab_")
->where("(fine > 0 or reward > 0) and company_type = 2")
->select();
@ -23,20 +23,7 @@ class OldCountController extends \Think\Controller
$statement_info[0]['game_list'][0]['reward'] = $value['reward'];
$statement_info = json_encode($statement_info);
M("company_statement_info","tab_")->where(['id'=>$value['id']])->save(['statement_info'=>$statement_info]);
}
$pool_data = M("company_statement_pool",'tab_')->where(['id'=>['in',[22,27]]])->select();
foreach ($pool_data as $key => $value) {
$save = json_decode($value['verify_log'],true);
$save['firstverify_user'] = $save['verify_user'];
$save['firstverify_time'] = $save['verify_time'];
$save = json_encode($save);
M('company_statement_pool','tab_')->where(['id'=>$value['id']])->save(['verify_log'=>$save]);
M("company_lack_statement_info","tab_")->where(['id'=>$value['id']])->save(['statement_info'=>$statement_info]);
}

8
Application/Admin/View/CompanyStatementPool/editPuPool.html
Unescape Escape View File

@ -172,8 +172,10 @@
<td><span class="sum_money_span">{$com['statement_info'][0]['game_list'][0]['sum_money']}</span>
<input class="sum_money" name="sum_money[{$com['id']}][{$com['statement_info'][0]['account']}][]" value="{$com['statement_info'][0]['game_list'][0]['sum_money']}" style="width: 20px;display: none">
<input class="st" name="st[{$com['id']}][{$com['statement_info'][0]['account']}]" value="{$com['st']}" style="width: 20px;display: none"></td>
<td rowspan="{$com['statement_info'][0]['time_row']}">{$com['reward']}</td>
<td rowspan="{$com['statement_info'][0]['time_row']}">{$com['fine']}</td>
<!-- <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['reward']}</td>-->
<!-- <td rowspan="{$com['statement_info'][0]['time_row']}">{$com['fine']}</td>-->
<td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['reward']||default="0"}</td>
<td rowspan="{$com['statement_info'][0]['time_row']}">{$com['statement_info'][0]['fine']||default="0"}</td>
<td rowspan="{$com['statement_info'][0]['time_row']}">
<input class="withhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$com['statement_info'][0]['withhold_amount']|default=0}" style="width: 40px;" name="withhold[{$com['id']}][{$com['statement_info'][0]['account']}][{$com['statement_info'][0]['game_list'][0]['statement_begin_time']}]">
<input class="oldwithhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$com['statement_info'][0]['withhold_amount']|default=0}" style="width: 40px;display: none" >
@ -209,7 +211,7 @@
</if>
<td rowspan="{$com.row}"><if condition="$com['is_payment'] eq 1">是 <else /> 否 </if></td>
<td rowspan="{$com.row}"><if condition="$com['st'] eq 0">否 <else /> 是 </if></td>
<td rowspan="{$com.row}"><textarea name="remark[{$com['id']}]">{$com.remark}</textarea></td>
<td rowspan="{$com.row}"><textarea name="remark[{$com['id']}][{$com['st']}]">{$com.remark}</textarea></td>
<if condition="!$is_export">
<td rowspan="{$com.row}">

Write Preview
Loading…
Cancel
Save