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

11月功能提交

Browse Source
master
zhengyongxing
parent f49cd75e86
commit d6b1916a5d
4 changed files with 119 additions and 9 deletions

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

@ -30,7 +30,7 @@ class CompanyGameRatioController extends AdminController
public function setCompanyBelong($company_belong = 0) {
if($company_belong == '0') {
return '内团';
} elseif($company_belong == '0') {
} elseif($company_belong == '1') {
return '外团';
} else {
return '外团-分发';

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

@ -616,6 +616,7 @@ class CompanyStatementSetController extends Controller {
$tmpp = M("PromoteCompany","tab_")->field("id,uid,company_name partner,settlement_contact link_man,address,contact_phone link_phone,bank_name opening_bank,bank_address payee_name,bank_card bank_account,fax_ratio,taxation_rate,company_belong,company_type,ali_user,ali_account,has_server_fee,server_fee,has_ratio,turnover_ratio")
->where($pc_map)
->select();
// dump($tmpp);
if(empty($tmpp)){
return true;
}
@ -723,7 +724,10 @@ class CompanyStatementSetController extends Controller {
if(count($t_game_ratio) == 1){
$tmp_game_ratio = $t_game_ratio[0];
$game['pay_amount'] = $v['game_list'][$t_game_id]['pay_amount'];
$game['pay_amount'] =$this->getRelationGameIdSpend($add_data['company_id'],$t_game_id,$tmp_game_ratio['begintime'],$tmp_game_ratio['endtime']);
// $game['pay_amount'] = $v['game_list'][$t_game_id]['pay_amount'];
$game['pay_amount'] -=0;
$game['statement_begin_time']=$statement_begin_time;
@ -865,6 +869,19 @@ class CompanyStatementSetController extends Controller {
$add_data['pay_amount'] -= $server_count;;
}
}
$is_continue = false;
$statement_data = $add_data['statement_info'];
foreach ($statement_data as $skey => $sval) {
if ($sval['game_list']) {
$is_continue = true;
}
}
if (!$is_continue) {
continue;
}
$add_data['statement_info'] = json_encode($add_data['statement_info'],JSON_UNESCAPED_UNICODE);
if($type == 2 && $add_data['statement_money'] == 0){
@ -1420,6 +1437,8 @@ class CompanyStatementSetController extends Controller {
$p_info['ratio']=$tratio;
}
$p_info['pay_amount'] = $this->getRelationGameIdPromoteSpend($p_info["p_id"],$p_info['relation_game_id'],$tmp_game_ratio['begintime'],$tmp_game_ratio['endtime']);
$v['platform_amount'] += $p_info['pay_amount'];
$p_info['sum_money']=round($p_info['pay_amount']*$tratio/100,2); //个人等于 结算金额*比例
$v['pay_amount'] += $p_info['sum_money'];
@ -1449,7 +1468,12 @@ class CompanyStatementSetController extends Controller {
$p_info['statement_type']=0;
$va['game_list'][] = $p_info;
if ($p_info['pay_amount'] !='0') {
$va['game_list'][] = $p_info;
}
}else{
for ($i=0; $i < $ratioCount; $i++) {
$temp_game = [];
@ -1517,15 +1541,16 @@ class CompanyStatementSetController extends Controller {
// }
$temp_game['statement_type']=0;
// $temp_game['fine'] = $RewardRecordRes['fine']?$RewardRecordRes['fine']:0;
// $temp_game['reward'] = $RewardRecordRes['reward']?$RewardRecordRes['reward']:0;
$temp_game['relation_game_id']=$p_info["relation_game_id"];
$temp_game['game_name']=$p_info["game_name"];
$temp_game['game_type_name']=$p_info["game_type_name"];
$temp_game['all_pay_amount']=$p_info["all_pay_amount"];
$va['game_list'][] = $temp_game;
if ($temp_game['pay_amount'] != '0') {
$va['game_list'][] = $temp_game;
}
}
}
}
@ -1563,6 +1588,19 @@ class CompanyStatementSetController extends Controller {
"statement_info"=>json_encode($v['statement_info'],JSON_UNESCAPED_UNICODE)
];
}
$is_continue = false;
$statement_data = $v['statement_info'];
foreach ($statement_data as $skey => $sval) {
if ($sval['game_list']) {
$is_continue = true;
}
// dump($sval);
}
if (!$is_continue) {
continue;
}
//无需补点不统计其他金额
if($type == 2 && $v['statement_money'] == 0){
continue ;
@ -1601,6 +1639,7 @@ class CompanyStatementSetController extends Controller {
if($v['platform_amount'] == 0 && $v['statement_money'] == 0){
continue ;
}
if($v['platform_amount'] < 300){
//存未满
// if($lackcompany['pay_amount'] != 0){

4
Application/Admin/Controller/TimingController.class.php
Unescape Escape View File

@ -841,8 +841,8 @@ class TimingController extends AdminController {
public function test() {
// $this->getSpecialComplement(strtotime(date("Y-m-1",strtotime("2020-07"))),strtotime(date("Y-m-t",strtotime("2020-07")))+86399,2259);
// dump(D("CompanyGameRatio")->getPromoteCompanyGameRatio(64,(string)211,1596211200,1598889599,1));
$this->createMarketBonus("all");
dump(D("CompanyGameRatio")->getPromoteCompanyGameRatio(18,(string)207,1600099200,1603728000,1));
// $this->createMarketBonus("all");
}

73
Application/Admin/Model/CompanyGameRatioModel.class.php
Unescape Escape View File

@ -18,6 +18,7 @@ class CompanyGameRatioModel extends Model
$is_inside = M("PromoteCompany","tab_")->field("is_inside")->where("id='{$company_id}'")->find()['is_inside'];
//设置默认
$game_ratio = [];
$tmp_g = explode(",",$game_ids);
@ -31,7 +32,77 @@ class CompanyGameRatioModel extends Model
"turnover_ratio"=>''
]];
}else{
$game_ratio[$game_id] = $this->getGameRadio($company_id,$game_id,$company_belong,$begintime,$endtime);
$company_belong_game = M("company_belong_game","tab_")
->field("game_ids,begin_time,end_time")
->where("((begin_time<={$begintime} and (end_time >={$begintime} or end_time=0)) or (begin_time<={$endtime} and end_time >={$endtime}) or (end_time>={$begintime} and end_time <={$endtime})) AND game_ids like '%,{$game_id},%'")
->order("begin_time ASC")
->select();
if ($company_belong == 1 && !empty($company_belong_game)) {
$company_begin_time = $begintime;
$company_end_time = $endtime;
$game_ratio[$game_id] = [];
foreach($company_belong_game as $key => $value) {
if ($value['begin_time'] > $company_begin_time) {
$game_ratio[$game_id] = array_merge($game_ratio[$game_id],$this->getGameRadio($company_id,$game_id,$company_belong,$company_begin_time,$value['begin_time']));
if ($value['end_time'] >= $company_end_time) {
// $game_ratio[$game_id] = array_merge($game_ratio[$game_id],[[
// "begintime" => $value['begin_time'],
// "endtime"=>$company_end_time,
// "ratio"=>0,
// "turnover_ratio"=>''
// ]]);
} else {
// $game_ratio[$game_id] = array_merge($game_ratio[$game_id],[[
// "begintime" => $value['begin_time'],
// "endtime"=>$value['end_time']+86399,
// "ratio"=>0,
// "turnover_ratio"=>''
// ]]);
if (!$company_belong_game[$key+1]['begin_time']) {
// $game_ratio[$game_id] = array_merge($game_ratio[$game_id],[[
// "begintime" => $value['end_time']+86400,
// "endtime"=>$company_end_time,
// "ratio"=>0,
// "turnover_ratio"=>''
// ]]);
$game_ratio[$game_id] = array_merge($game_ratio[$game_id],$this->getGameRadio($company_id,$game_id,$company_belong,$value['end_time']+86400,$company_end_time));
} else {
$company_begin_time = $value['end_time'];
}
}
} else {
if ($value['end_time'] >= $company_end_time) {
// $game_ratio[$game_id] = array_merge($game_ratio[$game_id],[[
// "begintime" => $company_begin_time,
// "endtime"=>$company_end_time,
// "ratio"=>0,
// "turnover_ratio"=>''
// ]]);
} else {
// $game_ratio[$game_id] = array_merge($game_ratio[$game_id],[[
// "begintime" => $company_begin_time,
// "endtime"=>$value['end_time']+86399,
// "ratio"=>0,
// "turnover_ratio"=>''
// ]]);
if (!$company_belong_game[$key+1]['begin_time']) {
$game_ratio[$game_id] = array_merge($game_ratio[$game_id],$this->getGameRadio($company_id,$game_id,$company_belong,$value['end_time']+86400,$company_end_time));
} else {
$company_begin_time = $value['end_time'];
}
}
}
}
} else {
$game_ratio[$game_id] = $this->getGameRadio($company_id,$game_id,$company_belong,$begintime,$endtime);
}
}
}
return $game_ratio;

Write Preview
Loading…
Cancel
Save