From a14f0abb88d375e61c6811e28cbeeb389ec4fa83 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 29 Jul 2020 10:15:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=8A=E6=B8=B8=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementSetController.class.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index e96474a28..c24433cb4 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 = []; From 92ccc96dcd028ab7cb96d67139b3a9b5c57efba5 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 29 Jul 2020 10:33:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E7=BB=93=E7=AE=97=E6=97=B6=E9=97=B4=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementSetController.class.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index c24433cb4..6360b8770 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -517,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_"); @@ -550,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_"); @@ -558,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){ From 853c938edb25d3d78304baf3a3d19578d054e895 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 29 Jul 2020 10:50:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=BB=93=E7=AE=97=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementSetController.class.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 6360b8770..f1ccf89a0 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -868,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;} From 8b8b0721b3b39c6757d57af944d971b15ea366d1 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 29 Jul 2020 10:58:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/View/PromoteCompany/add.html | 4 ++-- .../Admin/View/PromoteCompany/edit.html | 20 ++++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Application/Admin/View/PromoteCompany/add.html b/Application/Admin/View/PromoteCompany/add.html index 47cc3d384..c79493707 100644 --- a/Application/Admin/View/PromoteCompany/add.html +++ b/Application/Admin/View/PromoteCompany/add.html @@ -515,7 +515,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 +532,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..2961c1ab7 100644 --- a/Application/Admin/View/PromoteCompany/edit.html +++ b/Application/Admin/View/PromoteCompany/edit.html @@ -588,10 +588,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 = ''; From aabc0703dfaf65a1f2fb7efb0b8cb1df8564aca0 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 29 Jul 2020 11:07:25 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Partner/add.html | 3 +++ Application/Admin/View/Partner/edit.html | 2 ++ Application/Admin/View/PromoteCompany/add.html | 15 ++++----------- Application/Admin/View/PromoteCompany/edit.html | 15 ++++----------- 4 files changed, 13 insertions(+), 22 deletions(-) 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 c79493707..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, diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html index 2961c1ab7..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,