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

优化个人比例获取方式
master
廖金灵 4 years ago committed by Gogs
commit ead27056c5

@ -935,6 +935,7 @@ class CompanyStatementSetController extends Controller {
$v['reward'] = 0; $v['reward'] = 0;
$v['platform_amount'] = 0; $v['platform_amount'] = 0;
if(!isset($v['list'])){continue;} if(!isset($v['list'])){continue;}
$company_belong = $pc[$v['id']]['company_belong'];
//服务器费用 //服务器费用
if ($type < 2) { if ($type < 2) {
if ($v['has_server_fee'] == 1 && $v['server_fee'] > 0) { if ($v['has_server_fee'] == 1 && $v['server_fee'] > 0) {

@ -2162,7 +2162,7 @@ function getGamePromoteCompanyRadio($company_id,$relation_game_id,$endtime,$amou
if(empty($cgr_res)){ if(empty($cgr_res)){
//模板搜索 //模板搜索
//获取公司类型 //获取公司类型
if($company_belong === false){ if($company_belong == false){
$company_belong = M("PromoteCompany","tab_")->field("company_belong")->where("id='{$company_id}'")->find()['company_belong']; $company_belong = M("PromoteCompany","tab_")->field("company_belong")->where("id='{$company_id}'")->find()['company_belong'];
} }
$mwhere = "company_belong='{$company_belong}' and relation_game_id='{$relation_game_id}'"; $mwhere = "company_belong='{$company_belong}' and relation_game_id='{$relation_game_id}'";

Loading…
Cancel
Save