diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index e96474a28..f1ccf89a0 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -181,14 +181,19 @@ class CompanyStatementSetController extends Controller { } if(count($js_id) ==0 || count($cpList) == 0){return ;} - $cp_id = implode(",",array_flip(array_flip(array_keys($cpList)))); + $cp_id = implode(",",array_flip(array_flip(array_keys($cpList))));//已绑定关系 $js_id = implode(",",array_unique($js_id)); //获取cp公司 - $tmpp = M("Partner","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank,channel_rate,invoice_rate,taxation_rate,company_type,ali_user,ali_account,has_advance_charge,has_server_fee,server_fee")->where(["id"=>['in',$cp_id]])->select(); + $cpmap = [ + "id"=>['in',$cp_id], + "_string"=>"(validity_start_time > 0 AND validity_end_time = 0 ) OR validity_end_time >= {$endtime}" + ]; + $tmpp = M("Partner","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank,channel_rate,invoice_rate,taxation_rate,company_type,ali_user,ali_account,has_advance_charge,has_server_fee,server_fee")->where($cpmap)->select(); $cp =[]; foreach ($tmpp as $v) { $cp[$v['id']]=$v; } + $cp_id = implode(",",array_column($tmpp,"id")); //结算的id unset($tmpp); //获取己方公司 $our = []; @@ -512,9 +517,14 @@ class CompanyStatementSetController extends Controller { //无需处理 return ; } + $pc_map = [ + "id"=>["IN",$pc_id], + "_string"=>"(validity_start_time > 0 AND validity_end_time = 0 ) OR validity_end_time >= {$endtime}", + "company_type"=>1 + ]; //获取pc公司 $tmpp = M("PromoteCompany","tab_")->field("id,uid,company_name partner,settlement_contact link_man,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(["id"=>['in',$pc_id],"company_type"=>1]) + ->where($pc_map) ->select(); $pc =[]; $Promote = M("Promote","tab_"); @@ -545,7 +555,6 @@ class CompanyStatementSetController extends Controller { unset($tmpp); unset($js_id); $this->getPromoteCompanySpend($pcList,array_unique(array_keys($pcList)),$begintime,$endtime); - // dd($pcList); //数据整合 $verify_log=json_encode(["create_user"=>"system","create_time"=>date("Y-m-d H:i:s")]); $StatementDb = M("CompanyStatement","tab_"); @@ -553,7 +562,6 @@ class CompanyStatementSetController extends Controller { $statement_begin_time = date("Y-m-d",$begintime); $statement_end_time = date("Y-m-d",$endtime); $RewardRecord = M("RewardDetail","tab_"); - foreach($pcList as $k=>$v){ if(!isset($pc[$k])){continue;}//不存在的公司不结算 if($pc[$k]['has_ratio'] == 1){ @@ -860,9 +868,14 @@ class CompanyStatementSetController extends Controller { } //获取pc公司 $pc_id = implode(",",array_flip(array_flip(array_keys($pcList)))); + $pu_map = [ + "id"=>["IN",$pc_id], + "_string"=>"(validity_start_time > 0 AND validity_end_time = 0 ) OR validity_end_time >= {$endtime}", + "company_type"=>2 + ]; $tmpp = M("PromoteCompany","tab_") ->field("id,uid,company_name partner,settlement_contact link_man,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(["id"=>['in',$pc_id],"company_type"=>2]) + ->where($pu_map) ->select(); if(count($tmpp)<1){return;} diff --git a/Application/Admin/View/Partner/add.html b/Application/Admin/View/Partner/add.html index ab72c45e1..b0e4f67a6 100644 --- a/Application/Admin/View/Partner/add.html +++ b/Application/Admin/View/Partner/add.html @@ -48,6 +48,7 @@ - + 结束时间不选默认永久 @@ -56,6 +57,7 @@ - + 结束时间不选默认永久 @@ -385,6 +387,7 @@ return false; }); + $(".time3").datetimepicker("setDate", new Date()); $('.time4').datetimepicker({ format: 'yyyy-mm-dd', diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html index cf2c01034..c575f173e 100644 --- a/Application/Admin/View/Partner/edit.html +++ b/Application/Admin/View/Partner/edit.html @@ -48,6 +48,7 @@ - + 结束时间不选默认永久 @@ -56,6 +57,7 @@ - + 结束时间不选默认永久 diff --git a/Application/Admin/View/PromoteCompany/add.html b/Application/Admin/View/PromoteCompany/add.html index 47cc3d384..24915dbd4 100644 --- a/Application/Admin/View/PromoteCompany/add.html +++ b/Application/Admin/View/PromoteCompany/add.html @@ -167,16 +167,9 @@ 合同期限: -
- -  -  -
- - -
-
+ +  -  + 结束时间不选默认永久 @@ -490,7 +483,7 @@ return false; }); - $('#datetimepicker').datetimepicker({ + $('#contact_end').datetimepicker({ format: 'yyyy-mm-dd', language: "zh-CN", minView: 2, @@ -515,7 +508,7 @@ if(isNaN(end)) {return false;} - if(start>=end) {layer.msg('开始时间必须小于结束时间');return false;} + if(start>=end) {layer.msg('开始时间必须小于结束时间');$('.time3').val('');return false;} return false; }); @@ -532,7 +525,7 @@ if(isNaN(start)) {return false;} - if(start>=end) {layer.msg('开始时间必须小于结束时间');return false;} + if(start>=end) {layer.msg('开始时间必须小于结束时间');$('.time4').val('');return false;} return false; }); diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html index aa615709c..dba23c5e4 100644 --- a/Application/Admin/View/PromoteCompany/edit.html +++ b/Application/Admin/View/PromoteCompany/edit.html @@ -166,16 +166,9 @@ 合同期限: -
- -  -  -
- - -
-
+ +  -  + 结束时间不选默认永久 @@ -564,7 +557,7 @@ return false; }); - $('#datetimepicker').datetimepicker({ + $('#contact_end').datetimepicker({ format: 'yyyy-mm-dd', language: "zh-CN", minView: 2, @@ -588,10 +581,28 @@ if(isNaN(end)) {return false;} - if(start>=end) {layer.msg('开始时间必须小于结束时间');return false;} + if(start>=end) {layer.msg('开始时间必须小于结束时间');$('.time3').val('');return false;} return false; }); + + $('.time4').datetimepicker({ + format: 'yyyy-mm-dd', + language:"zh-CN", + minView: "month", + autoclose:true + }).change(function(){ + var end = new Date($(this).val()).getTime(); + var start = new Date($('.time3').val()).getTime(); + + if(isNaN(start)) {return false;} + + if(start>=end) {layer.msg('开始时间必须小于结束时间');$('.time4').val('');return false;} + + + return false; + }); + $('.iconfont-btn-add').click(function (e) { var delBtn = $('.iconfont-btn-del'); var html = '';