From a948986b41318d6adf9be48eebfee320dc87ceab Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 24 Jul 2020 20:33:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E6=B8=B8=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/PartnerController.class.php   |  8 ++++++++
 Application/Admin/View/Partner/export.html         | 14 ++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php
index 2b2f51c4e..5103114e2 100644
--- a/Application/Admin/Controller/PartnerController.class.php
+++ b/Application/Admin/Controller/PartnerController.class.php
@@ -158,6 +158,14 @@ class PartnerController extends ThinkController
             $value['game'] = $parseGames[$value['id']];
             $value['has_advance_charge'] = $value['has_advance_charge'] ? '是' : '否';
             $value['is_sign_contract'] = $value['is_sign_contract'] ? '是' : '否';
+            if(empty($value['has_server_fee'])){
+                $value['server_fee'] = 0;
+            }
+            $value['has_server_fee'] = $value['has_server_fee'] ? '是' : '否';
+            $value['cooperation_status'] = $value['cooperation_status'] ? '合作中' : '暂停合作';
+            
+
+            
 
             $value['company_type'] = $value['company_type'] == 2 ? '个人' : '公司';
             $contract_start_time = $value['contract_start_time'] ?
diff --git a/Application/Admin/View/Partner/export.html b/Application/Admin/View/Partner/export.html
index 26de735a8..ffaa54b40 100644
--- a/Application/Admin/View/Partner/export.html
+++ b/Application/Admin/View/Partner/export.html
@@ -68,9 +68,11 @@
                     <th>是否为收款方</th>
 
                     <th>预付款金额</th>
+                    <th>是否有游戏资质</th>
                     <th>是否签署合同</th>
                     <th>合同期限</th>
                     <th>生效期限</th>
+                    <th>公司税号</th>
                     <th>开票税点</th>
 
                     <th>发票类型</th>
@@ -83,6 +85,10 @@
 
                     <th>联系电话</th>
                     <th>联系地址</th>
+                    <th>承担服务器费用</th>
+                    <th>服务器费用</th>
+                    <th>合作关系</th>
+                    <th>备注</th>
                 </tr>
                 </thead>
 
@@ -123,9 +129,12 @@
                             <td rowspan="{$data.row}">{$data.is_collection|default="--"}</td>
 
                             <td rowspan="{$data.row}">{$data.advance_amount|default="--"}</td>
+                            <td rowspan="{$data.row}">{$data.has_advance_charge|default="--"}</td>
                             <td rowspan="{$data.row}">{$data.is_sign_contract|default="--"}</td>
                             <td rowspan="{$data.row}">{$data.contract_time}</td>
                             <td rowspan="{$data.row}">{$data.validity_time}</td>
+
+                            <td rowspan="{$data.row}">{$data.company_tax_no|default="--"}</td>
                             <td rowspan="{$data.row}">{$data.invoice_rate|showPercent}</td>
 
                             <td rowspan="{$data.row}">{$data.invoice_type|default="--"}</td>
@@ -139,6 +148,11 @@
                             <td rowspan="{$data.row}">{$data.link_phone|default="--"}</td>
                             <td rowspan="{$data.row}">{$data.address|default="--"}</td>
 
+                            <td rowspan="{$data.row}">{$data.has_server_fee|default="--"}</td>
+                            <td rowspan="{$data.row}">{$data.server_fee|default="--"}</td>
+                            <td rowspan="{$data.row}">{$data.cooperation_status|default="--"}</td>
+                            <td rowspan="{$data.row}">{$data.remark}</td>
+
                         </tr>
                         <if condition="$data['game'][0]['row'] gt 1">
                             <foreach name="data['game'][0]['game_ratio']" item="game_ratio" key="gamekey">