From 1f31244d10f541cbddcc1a8325fe89dd5119af21 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 12 Oct 2020 18:14:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=9A=E5=90=88=E6=B1=87=E6=80=BB=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...regateFinanceStatementController.class.php |   2 +-
 .../Admin/View/AggregateRelation/edit.html    |   3 ++-
 .../Admin/View/CpJuheCompany/export.html      |   2 +-
 .../Admin/excel/aggregate_person_stream.xls   | Bin 22528 -> 22528 bytes
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
index 6b4e1d496..287c971f2 100644
--- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php
+++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
@@ -655,7 +655,7 @@ class AggregateFinanceStatementController extends ThinkController
             $company_info = json_decode($relation['second_company_info'],true);
         }
 
-        if ($company_info['invoice_type']) {
+        if ($company_info['invoice_type']&&$company_info['invoice_type']!='0') {
             $company_type = 1;
         } else {
             $company_type = 2;
diff --git a/Application/Admin/View/AggregateRelation/edit.html b/Application/Admin/View/AggregateRelation/edit.html
index eddd8017f..b04a410da 100644
--- a/Application/Admin/View/AggregateRelation/edit.html
+++ b/Application/Admin/View/AggregateRelation/edit.html
@@ -305,6 +305,7 @@ $(function(){
     } else if (get_collection == 2) {
       companyinfo = second_company;
     }
+    console.log(companyinfo)
     setAggregateInfo(companyinfo.invoice_item,companyinfo.withdraw_type,companyinfo.invoice_type,get_collection);
   });
   function setAggregateInfo(invoice_content,settlement_type,invoice_type,collection) {
@@ -333,7 +334,7 @@ $(function(){
       //   $('#invoice_type').prop("disabled",true);
       // }
       $("#settlement_type").find("option[value="+settlement_type+"]").prop("selected",true);
-
+      console.log(invoice_type);
       $("#invoice_type").find("option[value="+invoice_type+"]").prop("selected",true);
       $("#settlement_type").change();
       $("#invoice_type").change();
diff --git a/Application/Admin/View/CpJuheCompany/export.html b/Application/Admin/View/CpJuheCompany/export.html
index 79fcfce76..9623b174c 100644
--- a/Application/Admin/View/CpJuheCompany/export.html
+++ b/Application/Admin/View/CpJuheCompany/export.html
@@ -103,7 +103,7 @@
           <th >聚合包名</th>
           <th >产品类型</th>
           <th >结算周期</th>
-          <th colspan="2">游戏分成比例</th>
+          <th colspan="2">我方分成比例</th>
           <th >户名</th>
           <th >账号</th>
           <th >开户行</th>
diff --git a/Public/Admin/excel/aggregate_person_stream.xls b/Public/Admin/excel/aggregate_person_stream.xls
index b56405e2125454c02cffd56ba0d93212c7619df3..bd3dedc9a5b2a4be4d432e501ecd5dfe573762f6 100644
GIT binary patch
delta 60
zcmZqJz}T>XaYGIZn?c`ti}D4Vi&(ZX%JMQWIx?g%<T7M3<N<LpLkU9>Ln4sO2hx)r
M*@8FEV9N*u04R<S=l}o!

delta 48
zcmZqJz}T>XaYGIZ8^hM{1g80$i&(ZX^0G28CNdN=lmcNf!{k6V_sI!tGMi_xWds5M
DXs`|n