From ac5c1a199c21a9e5282d9cf605d8aaab0447845d Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 12 Oct 2020 17:28:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=9A=E5=90=88=E7=BB=93=E7=AE=97=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...regateFinanceStatementController.class.php | 6 +-- .../AggregateRelationController.class.php | 36 +++++++++++------- .../Admin/View/CpJuheCompany/index.html | 2 +- Public/Admin/excel/aggregate_stream.xls | Bin 24576 -> 23552 bytes 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php index 1d1d73bfd..6b4e1d496 100644 --- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php +++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php @@ -655,13 +655,13 @@ class AggregateFinanceStatementController extends ThinkController $company_info = json_decode($relation['second_company_info'],true); } - if ($company_info['company_type']=='个人') { + if ($company_info['invoice_type']) { $company_type = 1; - } elseif($company_info['company_type']=='公司') { + } else { $company_type = 2; } - if ($company_type == 1) { + if ($company_type == 2) { $this->excelDownStreamPersonTemplate($data,$big_pay_money); } else { $this->excelDownStreamTemplate($data,$big_pay_money); diff --git a/Application/Admin/Controller/AggregateRelationController.class.php b/Application/Admin/Controller/AggregateRelationController.class.php index 590c0641d..bedec1f2e 100644 --- a/Application/Admin/Controller/AggregateRelationController.class.php +++ b/Application/Admin/Controller/AggregateRelationController.class.php @@ -496,7 +496,7 @@ class AggregateRelationController extends AdminController //查询 $y = $this->DBModel->where("id='{$p['id']}'")->find(); - if($y['settlement_type'] != $p['settlement_type'] || $y['invoice_type'] != $p['invoice_type'] || $y['invoice_content'] != $p['invoice_content'] || $y['is_payment'] != $p['is_payment'] || $y['collection'] != $p['collection']){ +// if($y['settlement_type'] != $p['settlement_type'] || $y['invoice_type'] != $p['invoice_type'] || $y['invoice_content'] != $p['invoice_content'] || $y['is_payment'] != $p['is_payment'] || $y['collection'] != $p['collection']){ //修改了进行审核 $p['status'] = 0; $verify_log = [ @@ -517,9 +517,13 @@ class AggregateRelationController extends AdminController $p['second_company_id'] = $y['second_company_id']; $p['second_company_name'] = $y['second_company_name']; $p['second_company_type'] = $y['second_company_type']; - } else { - $this->error('未做任何修改'); - } +// } else { +// $verify_log = [ +// "create_user"=>$this->admininfo["username"], +// "create_time"=>date("Y-m-d H:i:s") +// ]; +// $p['verify_log'] = json_encode($verify_log); +// } if($p['first_company_type'] > 0){ $where = " (first_company_type ='{$p['first_company_type']}' and first_company_id = '{$p['first_company_id']}') @@ -549,9 +553,11 @@ class AggregateRelationController extends AdminController $company_info['invoice_item'] = $p['invoice_content']; if ($p['invoice_type'] == 1) { - $company_info['invoice_type'] = "专票"; + $company_info['invoice_type'] = "增值税专用发票"; } elseif($p['invoice_type'] == 2) { - $company_info['invoice_type'] = "普票"; + $company_info['invoice_type'] = "增值税普通发票"; + } else { + $company_info['invoice_type'] = ""; } $p['first_company_info'] = json_encode($company_info); @@ -561,9 +567,11 @@ class AggregateRelationController extends AdminController $company_info = json_decode($p['second_company_info'],true); $company_info['invoice_item'] = $p['invoice_content']; if ($p['invoice_type'] == 1) { - $company_info['invoice_type'] = "专票"; + $company_info['invoice_type'] = "增值税专用发票"; } elseif($p['invoice_type'] == 2) { - $company_info['invoice_type'] = "普票"; + $company_info['invoice_type'] = "增值税普通发票"; + } else { + $company_info['invoice_type'] = ""; } $p['second_company_info'] = json_encode($company_info); @@ -591,12 +599,12 @@ class AggregateRelationController extends AdminController $dbres = $this->DBModel->where($map)->find(); $first_company_info = $this->getCompanyInfo($dbres['first_company_type'],$dbres['first_company_id']); - $first_company_info['invoice_type'] = $first_company_info['invoice_type'] == "专票" ? 1 : ($first_company_info['invoice_type'] == "普票"?2:''); + $first_company_info['invoice_type'] = strstr($first_company_info['invoice_type'],'专') ? 1 : (strstr($first_company_info['invoice_type'],'普')?2:''); $this->assign('first_company_info',$first_company_info); $second_company_info = $this->getCompanyInfo($dbres['second_company_type'],$dbres['second_company_id']); - $second_company_info['invoice_type'] = $second_company_info['invoice_type'] == "专票" ? 1 : ($second_company_info['invoice_type'] == "普票"?2:''); + $second_company_info['invoice_type'] = strstr($second_company_info['invoice_type'],'专') ? 1 : (strstr($second_company_info['invoice_type'],'普')?2:''); $this->assign('second_company_info',$second_company_info); $dbres['first_company_type'] =$this->CompanyType[$dbres['first_company_type']]; @@ -704,9 +712,9 @@ class AggregateRelationController extends AdminController //己方公司 $companyInfo = M("CompanyInfo","tab_")->field("id,partner company_name,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank,invoice_item,invoice_type,register_phone,register_address")->where("status='1' AND id='{$id}'")->find(); if (strstr($companyInfo['invoice_type'],'专')) { - $companyInfo['invoice_type'] = "专票"; + $companyInfo['invoice_type'] = "增值税专用发票"; } else if (strstr($companyInfo['invoice_type'],'普')) { - $companyInfo['invoice_type'] = "普票"; + $companyInfo['invoice_type'] = "增值税普通发票"; } } if($type == 1){ @@ -723,9 +731,9 @@ class AggregateRelationController extends AdminController $companyInfo = $this->aggregateCompanyInfo; if($companyInfo['invoice_type'] == 1) { - $companyInfo['invoice_type'] = '专票'; + $companyInfo['invoice_type'] = '增值税专用发票'; } else if($companyInfo['invoice_type'] == 2) { - $companyInfo['invoice_type'] = '普票'; + $companyInfo['invoice_type'] = '增值税普通发票'; } } if(isset($companyInfo['company_belong'])){ diff --git a/Application/Admin/View/CpJuheCompany/index.html b/Application/Admin/View/CpJuheCompany/index.html index 3243d7751..33e975183 100644 --- a/Application/Admin/View/CpJuheCompany/index.html +++ b/Application/Admin/View/CpJuheCompany/index.html @@ -157,7 +157,7 @@ 聚合包名 产品类型 结算周期 - 游戏分成比例 + 我方分成比例 户名 账号 diff --git a/Public/Admin/excel/aggregate_stream.xls b/Public/Admin/excel/aggregate_stream.xls index c55d4cdf8385bb3106ac88a7c867ecb879c9a616..35d911c19d212f3c4f93cfb8f3cca9ec62f21e8e 100644 GIT binary patch delta 967 zcmZ`$T}TvB7`=CP_GcD%otYh-*=21oi&Cox}F*QM31!$zQu{qM7L3kh47PJF>jOM zH>_zt(x^wshj+S@xDgb+_&3(*XW_Zt4k?CoSToqcXHeiGBf+9UfCG#j%p{*>qG6M< zK@Z`0V>HMl?`P7XoM@jJ0UnXwn+&TSF}~Jf4p>%%IhKcPc9)ey$!I;mBJ=|xm+X=e znvy>t0ddd}s*+%Ul}MHIpH(cpVMQ!M4JTr*iv(*hg$|B^EG`nWAoC)Y2$u>EI0=g( zHI=9@xdftqjBJ_bg3(JE}K3#is5D`Z#rbT;r4V>~Qd5*?2J%uzzT8C(_-n}M|?!eK4}9$F%; zJ9nmS)izi}aC5xg8J^iCgj+>&Rz(mkI~%iMhK(UAxkj}^P&9l5ag33b{0~ZYAtWOT z=EY2G0)v!5Z|uJmrKU+&%rFqgB*EHeP zpX;yO=q|by-~PRnQlRl@KQ_W@ejJ5*A<8Wa*L)jZQ!zTz;t5WY5fh*kvgfe|I$Syk z6zHI-a5qCK0c1oH`UT@fY1B%A`lV=GXEq{T=zK<^>2xq$`r=8sMA1X}_eNCvscsE^ z52KY%>wQvWA{Zgy37!#H2o_+yvJFS5tyR-FNl%E?y594fm#;VXoTx1$pU4#q_K5YF gvN;^g{i8!_%OEsY7l1-Xs8iK8tj$K`flfO159NXw5dZ)H delta 1236 zcmZuxZA@EL7=BNC`*B%6Z)W?S=DBni-W+D zjj=_YO$7EXus=?w{~7E~qhtv+altIn(2Wpd)HF*l#Q4huN{sG$ZfTbp&CTzlB-Ob%`QdJ+`CFV zc$T@O3XAwB^P6dIX4|>F;vbqvOuxV0hd*eeM2$Y3^NEe?zQ>Th5vM3(tQ{Y-jrd4! z$MgD1vLQnw63VE=D8BZ5u zmMu>F#KNo1;K4JNJ%q!!)k(}(sS%VdE?QX(Sk3sptp-!pTJ%z$qI}%S6FX+DUaYln zj)r1U+Ge}i3eZ+T2Uc6$I&V>OV}SFzs>%V^1_l_e`htRwFaL?7nCmL5PjWq_$`+dwPuVz~uf&5kz+S5fVa86>v8QcF& z;4fuuM{aSubxr@STg?~we`nuUilZk?t5YkD+kI;EIxF-lAqXGkhotdO-E7LE31YRGU6!ST(Gt&3zeh_R|JQXXS_I zr_a6CJriCXOn2o+9Jn*|4Bl*C?kr@U6I)Vj|A}|3iLGvB2IX+db1R3jHf9ueoioUa zu08&NxF*8HFGrMj06+&du!CqornB&n!?uuL^?Ii?6#7DI(f~sv2x#cXXz=B(dl>I| z<0-^%hj|qT%7{BqPOL3XbAi3L8ZpH=>saFAX1EB8+mO(4%!@ cIA+uAVCe&dZ^c4VHs&Up0PKYTPBJzB0NS~BrT_o{