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

优化结算流水判定依旧平台流水
master
陈志 4 years ago committed by Gogs
commit 9df6fa97c3

@ -616,7 +616,7 @@ class CompanyStatementController extends ThinkController
} }
//创建基础未满基础信息 //创建基础未满基础信息
if($va['pay_amount'] < $no_pool_money){ if($va['platform_amount'] < $no_pool_money){
$lackcompany =[ $lackcompany =[
"company_id"=>$company_info['id'], "company_id"=>$company_info['id'],
"company_type"=>$v['company_type'], "company_type"=>$v['company_type'],
@ -651,16 +651,16 @@ class CompanyStatementController extends ThinkController
array_multisort($last_names,SORT_DESC,SORT_STRING,$va['statement_info']); array_multisort($last_names,SORT_DESC,SORT_STRING,$va['statement_info']);
} }
} }
if($va['pay_amount'] < $no_pool_money){ if($va['platform_amount'] < $no_pool_money){
//依旧小于不结算金额存旧版 //依旧小于不结算金额存旧版
if($lackcompany['pay_amount'] > 0){ if($lackcompany['pay_amount'] != 0){
$lask_id = $LackStatement->add($lackcompany); $lask_id = $LackStatement->add($lackcompany);
$v['create_lack_ids'][] =$lask_id; $v['create_lack_ids'][] =$lask_id;
$v['lack_statement_money'] +=$lackcompany['statement_money']; $v['lack_statement_money'] +=$lackcompany['statement_money'];
$v['lack_platform_amount'] +=$lackcompany['platform_amount']; $v['lack_platform_amount'] +=$lackcompany['platform_amount'];
} }
}else{ }else{
if($va['pay_amount'] > 0){ if($va['pay_amount'] != 0){
//存成功 //存成功
$company =[ $company =[
"pool_id"=>0, "pool_id"=>0,

@ -715,7 +715,7 @@ class CompanyStatementSetController extends Controller {
//金额为0不补点 //金额为0不补点
continue; continue;
} }
if($add_data['platform_amount'] <= 0){ if($add_data['platform_amount'] == 0){
return; return;
} }
// dd($add_data); // dd($add_data);
@ -1067,9 +1067,9 @@ class CompanyStatementSetController extends Controller {
if($type == 2 && $v['statement_money'] == 0){ if($type == 2 && $v['statement_money'] == 0){
//补点不存 //补点不存
}else{ }else{
if($v['pay_amount'] < 300){ if($v['platform_amount'] < 300){
//存未满 //存未满
if($lackcompany['pay_amount'] > 0){ if($lackcompany['pay_amount'] != 0){
$lask_id = $LackStatement->add($lackcompany); $lask_id = $LackStatement->add($lackcompany);
$countdata['create_lack_ids'][] =$lask_id; $countdata['create_lack_ids'][] =$lask_id;
$countdata['lack_statement_money'] +=$lackcompany['statement_money']; $countdata['lack_statement_money'] +=$lackcompany['statement_money'];
@ -1077,7 +1077,7 @@ class CompanyStatementSetController extends Controller {
} }
}else{ }else{
if($v['pay_amount'] > 0){ if($v['pay_amount'] != 0){
//存成功配置单号 //存成功配置单号
$company =[ $company =[
"pool_id"=>0, "pool_id"=>0,

Loading…
Cancel
Save