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

Merge branch 'feature/group_type' into dev

Browse Source
master
zhengchanglong 5 years ago
parent 1c00290da9 26c7190654
commit 868fde2d07
7 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File

8
Application/Admin/Common/extend.php
Unescape Escape View File

@ -1886,8 +1886,8 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_
}
//合计
$objPHPExcel->getActiveSheet()->setCellValue("E" . ($line), $all_sum_money);
$objPHPExcel->getActiveSheet()->setCellValue("J" . ($line), $all_pay_amount);
$objPHPExcel->getActiveSheet()->setCellValue("E" . ($line), $data['pay_amount']);
$objPHPExcel->getActiveSheet()->setCellValue("J" . ($line), $data['statement_money']);
$objPHPExcel->getActiveSheet()->setCellValue("J" . ($line+1), $big_all_sum_money); //本月分成总金额(人民币大写)
@ -1960,8 +1960,8 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al
$line++;
}
$objPHPExcel->getActiveSheet()->setCellValue('C'.($line), $all_sum_money);//合计-平台总额
$objPHPExcel->getActiveSheet()->setCellValue('F'.($line), $all_pay_amount);//合计-结算金额
$objPHPExcel->getActiveSheet()->setCellValue('C'.($line), $data['pay_amount']);//合计-平台总额
$objPHPExcel->getActiveSheet()->setCellValue('F'.($line), $data['statement_money']);//合计-结算金额
$objPHPExcel->getActiveSheet()->setCellValue('B'.($line+1), $big_all_sum_money);//大写支付结算金额

2
Application/Admin/Controller/PublicController.class.php
Unescape Escape View File

@ -78,7 +78,7 @@ class PublicController extends \Think\Controller
if (IS_POST) {
/* 检测验证码 TODO: */
// $this->checksafecode($mobile, $verify, false);
$this->checksafecode($mobile, $verify, false);
$promote = M('promote', 'tab_')->where([
'mobile_phone' => $mobile,
'level' => 1,

3
Application/Admin/Controller/StatementController.class.php
Unescape Escape View File

@ -64,8 +64,9 @@ class StatementController extends ThinkController
$mycompany = M("tool","tab_")->field("config")->where("name='company_info'")->find();
$info = json_decode($mycompany['config'],true);
$info['id'] = 0;
unset($info['status']);
}else{
$info = M("partner","tab_")->where("id = '{$CompanyId}'")->find();
$info = M("partner","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank")->where("id = '{$CompanyId}'")->find();
}
if(empty($info)){
$this->ajaxReturn(array("error"=>"no find","code"=>2000));

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

@ -53,7 +53,7 @@ class VerifyBillController extends Controller {
// dd($data);
$all_sum_money = array_sum(array_column($data['statement_info'], 'sum_money'));//合计平台总额
$all_pay_amount = array_sum(array_column($data['statement_info'], 'pay_amount'));//合计结算金额
$big_all_sum_money = convertAmountToCn($all_sum_money);//大写
$big_all_sum_money = convertAmountToCn($data['statement_money']);//大写
$this->assign('big_all_sum_money', $big_all_sum_money);
$this->assign('all_sum_money', $all_sum_money);
$this->assign('all_pay_amount', $all_pay_amount);
@ -94,10 +94,9 @@ class VerifyBillController extends Controller {
$all_sum_money = array_sum(array_column($data['statement_info'], 'sum_money'));//合计平台总额
$all_pay_amount = array_sum(array_column($data['statement_info'], 'pay_amount'));//合计结算金额
$big_all_sum_money = convertAmountToCn($all_sum_money);//大写
$big_all_sum_money = convertAmountToCn($data['statement_money']);//大写
$data['receive_company'] = $data['pay_type'] ? $data['first_party_info'] : $data['second_party_info'];
$data['pay_company'] = $data['pay_type'] ? $data['second_party_info'] : $data['first_party_info'];
dd($data['statement_info']);
if ($data['statement_type'] == 1) {//下游
excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_sum_money);
} else {//上游

1
Application/Admin/View/Query/marketList.html
Unescape Escape View File

@ -214,6 +214,7 @@
<volist name=":I('get.')" id="vo">
Think.setValue('{$key}',"{$vo}");
</volist>
highlight_subnav('{:U('StatementMangement/lists')}');
$(".select_gallery").select2();
</script>
<script type="text/javascript">

6
Application/Admin/View/VerifyBill/company_show.html
Unescape Escape View File

@ -109,7 +109,7 @@
<tr>
<td >-</td>
<td >{$item.type_name}</td>
<td >-</td>
<td >{$item.sum_money}</td>
<td >-</td>
<td >-</td>
<td >{$item.sum_money}</td>
@ -132,10 +132,10 @@
<tr>
<td><span>总计</span></td>
<td><span>-</span></td>
<td ><span><if condition="$all_pay_amount neq ''">{$all_pay_amount}<else/>0</if></span></td>
<td ><span><if condition="$data.pay_amount neq ''">{$data.pay_amount}<else/>0</if></span></td>
<td>-</td>
<td>-</td>
<td><if condition="$all_sum_money neq ''">{$all_sum_money}<else/>0</if></td>
<td><if condition="$data.statement_money neq ''">{$data.statement_money}<else/>0</if></td>
</tr>
<tr>
<td><span>本月分成总金额(人民币大写)：</span></td>

13
Application/Admin/View/VerifyBill/partner_show.html
Unescape Escape View File

@ -106,12 +106,12 @@
<tr>
<td >-</td>
<td >{$item.type_name}</td>
<td >{$item.pay_amount}</td>
<td >{$item.sum_money}元</td>
<td >-</td>
<td >-</td>
<td >-</td>
<td >-</td>
<td >{$item.sum_money}</td>
<td >{$item.sum_money}元</td>
</tr>
<else/>
@ -119,12 +119,12 @@
<tr>
<td >{$item.statement_begin_time}-{$item.statement_end_time}</td>
<td >{$item.game_name}</td>
<td >{$item.pay_amount}</td>
<td >{$item.pay_amount}元</td>
<td >{$item.first_ratio}%</td>
<td >{$item.second_ratio}%</td>
<td >{$item.promote_ratio}%</td>
<td >{$item.fax_ratio}%</td>
<td >{$item.sum_money}</td>
<td >{$item.sum_money}元</td>
</tr>
</if>
@ -133,12 +133,13 @@
<tr>
<td><span>总计</span></td>
<td><span>-</span></td>
<td ><span><if condition="$all_pay_amount neq ''">{$all_pay_amount}<else/>-</if></span></td>
<td ><if condition="$data.pay_amount neq ''">{$data.pay_amount}元<else/>0</if>
</td>
<td>-</td>
<td>-</td>
<td>-</td>
<td>-</td>
<td><if condition="$all_sum_money neq ''">{$all_sum_money}<else/>0</if></td>
<td><if condition="$data.statement_money neq ''">{$data.statement_money}元<else/>0</if></td>
</tr>
<tr>
<td><span>本月分成总金额(人民币大写)：</span></td>

Write Preview
Loading…
Cancel
Save