|
|
|
@ -880,14 +880,10 @@ class TimingController extends AdminController {
|
|
|
|
|
// "_string"=>"begin_time <={$endtime} AND ( end_time = 0 OR end_time >= {$begintime})"])
|
|
|
|
|
// ->select();
|
|
|
|
|
|
|
|
|
|
dump($company_id.'|'.$relation_game_id.'|'.$begintime.'|'.$endtime.'|'.$company_data['company_belong']);
|
|
|
|
|
|
|
|
|
|
$company_game_ratio = D("CompanyGameRatio")->getPromoteCompanyGameRatio($company_id,(string)$relation_game_id,$begintime,$endtime,$company_data['company_belong']);
|
|
|
|
|
|
|
|
|
|
$company_game_ratio = $company_game_ratio[$relation_game_id];
|
|
|
|
|
|
|
|
|
|
dump($company_game_ratio);
|
|
|
|
|
|
|
|
|
|
// $mould = json_decode($company_game_ratio['turnover_ratio'],true);
|
|
|
|
|
$amount = 0;
|
|
|
|
|
|
|
|
|
@ -1158,7 +1154,7 @@ class TimingController extends AdminController {
|
|
|
|
|
->join("left join tab_promote_company company on promote.company_id = company.id")
|
|
|
|
|
->join("left join ({$data}) auth on auth.uid=market_admin_id")
|
|
|
|
|
->where(['develop_type'=>['egt',1],'group_id'=>['in',['11','12','21']]])
|
|
|
|
|
->where(['company_id'=>64,'spend.promote_id'=>1726,'relation_game_id'=>211])
|
|
|
|
|
// ->where(['company_id'=>313,'spend.promote_id'=>4359,'relation_game_id'=>191])
|
|
|
|
|
// ->order("is_settlement ASC")
|
|
|
|
|
->select();
|
|
|
|
|
|
|
|
|
@ -1228,8 +1224,8 @@ class TimingController extends AdminController {
|
|
|
|
|
if ($cv['begin_time'] >= $begin_pay_time) {
|
|
|
|
|
|
|
|
|
|
$promote_data[$key]['promote_amount'] += $this->getCompanyGameRadio($value['admin_id'],$value['promote_id'],$value['company_id'],$value['relation_game_id'],$begin_pay_time,$cv['begin_time']-1,$value['pay_amount']);
|
|
|
|
|
dump(date($begin_pay_time)."-".date($cv['begin_time']-1));
|
|
|
|
|
dump($promote_data[$key]['promote_amount']);
|
|
|
|
|
// dump(date($begin_pay_time)."-".date($cv['begin_time']-1));
|
|
|
|
|
// dump($promote_data[$key]['promote_amount']);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
@ -1258,10 +1254,10 @@ class TimingController extends AdminController {
|
|
|
|
|
} else {
|
|
|
|
|
$cv['end_time'] = $cv['end_time']+86399;
|
|
|
|
|
}
|
|
|
|
|
dump($promote_data[$key]['promote_amount']);
|
|
|
|
|
dump(date($cv['begin_time'])."-".date($cv['end_time']));
|
|
|
|
|
// dump($promote_data[$key]['promote_amount']);
|
|
|
|
|
// dump(date($cv['begin_time'])."-".date($cv['end_time']));
|
|
|
|
|
$promote_data[$key]['promote_amount'] += $this->getCompanyGameRadio($value['admin_id'],$value['promote_id'],$value['company_id'],$value['relation_game_id'],$cv['begin_time'],$cv['end_time'],$value['pay_amount']);
|
|
|
|
|
dump($promote_data[$key]['promote_amount']);
|
|
|
|
|
// dump($promote_data[$key]['promote_amount']);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
@ -1338,7 +1334,7 @@ class TimingController extends AdminController {
|
|
|
|
|
$promote_data[$key]['company_profit'] = $value['pay_amount']-$promote_data[$key]['cp_amount']-$promote_data[$key]['promote_amount']-$promote_data[$key]['channel_amount']-$promote_data[$key]['company_tax']-$specialAmount;
|
|
|
|
|
|
|
|
|
|
$promote_data[$key]['promote_amount'] += $specialAmount;
|
|
|
|
|
dump($promote_data[$key]['promote_amount']);
|
|
|
|
|
// dump($promote_data[$key]['promote_amount']);
|
|
|
|
|
if ($value['promote_id'] == 0) {
|
|
|
|
|
// $promote_data[$key]['promote_account']='官方渠道';
|
|
|
|
|
// $promote_data[$key]['company_id']='0';
|
|
|
|
|