From 8ac604be3338f5fecc4c0c98411ab8e53c928c35 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 21 Jul 2020 16:58:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Common/function.php         |  14 +
 .../PromoteCompanyController.class.php        |  24 +-
 .../Admin/View/PromoteCompany/export.html     | 334 ++++++++++--------
 3 files changed, 229 insertions(+), 143 deletions(-)

diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php
index 5e7fcaef4..6659484eb 100644
--- a/Application/Admin/Common/function.php
+++ b/Application/Admin/Common/function.php
@@ -1027,4 +1027,18 @@ function PromoteStatistics($orderNo) {
     }
 
 }
+function showPercent($num)
+{
+    if($num-0 > 0){
+        if(strpos($num,"%")){
+            return $num;
+        }else{
+            return $num."%";
+        }
+       
+    }else{
+        return $num ?? "--";
+    }
+
+}
 
diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index ceb8ab474..236a4639d 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -68,7 +68,7 @@ class PromoteCompanyController extends ThinkController
         //获取公司信息
         if(!empty($companyres)){
             foreach($companyres as $k=>&$v){
-                $tmpr = D("CompanyRelation")->getCompanyRelation(2,$value['id']);
+                $tmpr = D("CompanyRelation")->getCompanyRelation(2,$v['id']);
                 $v["settlement_type"] = $tmpr['settlement_type'];
                 $v["company_belong"] = getCompanyBlong($v["company_belong"]);
                 $v["develop_type"] = getCompanyRelation($v["develop_type"]);
@@ -1058,8 +1058,17 @@ class PromoteCompanyController extends ThinkController
                     if($is_export){
                         if(isset($CpRadio[$t_gid])){
                             $senddata[$t_gid]["cp_ratio"] =  $CpRadio[$t_gid];
-                            if( count($CpRadio[$t_gid]) > $senddata[$t_gid]['row'] ){
+                            if( count($CpRadio[$t_gid]) >= $senddata[$t_gid]['row'] ){
+                                $c = count($CpRadio[$t_gid]) - $senddata[$t_gid]['row'];
+                                for ($x=0; $x<$c; $x++) {
+                                    $senddata[$t_gid]['turnover_ratio'][]=["name"=>"--","ratio"=>"--"];
+                                } 
                                 $senddata[$t_gid]['row'] = count($CpRadio[$t_gid]);
+                            }else{
+                                $c = $senddata[$t_gid]['row'] - count($CpRadio[$t_gid]);
+                                for ($x=0; $x<$c; $x++) {
+                                    $senddata[$t_gid]['cp_ratio'][]=["name"=>"--","ratio"=>"--"];
+                                } 
                             }
                         }
                     }
@@ -1085,8 +1094,17 @@ class PromoteCompanyController extends ThinkController
                     if($is_export){
                         if(isset($CpRadio[$t_gid])){
                             $senddata[$t_gid]["cp_ratio"] =  $CpRadio[$t_gid];
-                            if( count($CpRadio[$t_gid]) > $senddata[$t_gid]['row'] ){
+                            if( count($CpRadio[$t_gid]) >= $senddata[$t_gid]['row'] ){
+                                $c = count($CpRadio[$t_gid]) - $senddata[$t_gid]['row'];
+                                for ($x=0; $x<$c; $x++) {
+                                    $senddata[$t_gid]['turnover_ratio'][]=["name"=>"--","ratio"=>"--"];
+                                } 
                                 $senddata[$t_gid]['row'] = count($CpRadio[$t_gid]);
+                            }else{
+                                $c = $senddata[$t_gid]['row'] - count($CpRadio[$t_gid]);
+                                for ($x=0; $x<$c; $x++) {
+                                    $senddata[$t_gid]['cp_ratio'][]=["name"=>"--","ratio"=>"--"];
+                                } 
                             }
                         }
                     }
diff --git a/Application/Admin/View/PromoteCompany/export.html b/Application/Admin/View/PromoteCompany/export.html
index 66785a993..f63a5a59b 100644
--- a/Application/Admin/View/PromoteCompany/export.html
+++ b/Application/Admin/View/PromoteCompany/export.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta charset="UTF-8">
@@ -15,187 +16,240 @@
 </head>
 <style>
     html {
-        min-width:100%;
+        min-width: 100%;
     }
+
     body {
         padding: 0px;
     }
 </style>
+
 <body>
-    <div style="margin:auto;font-size: 20px;color: red;line-height: 3;padding: 20px;">
-        导出进行中。。。<br/>
+    <!-- <div style="margin:auto;font-size: 20px;color: red;line-height: 3;padding: 20px;">
+        导出进行中。。。<br />
         如果导出成功你也可以手动关闭此页面
-    </div>
-    <table border="1" id="exporttable" style="opacity: 0;">
+    </div> -->
+    <table border="1" id="exporttable" style="opacity: 1;">
         <!-- 表头 -->
         <thead>
             <tr>
                 <th>合作方名称</th>
                 <th>对应平台</th>
+                <th>内外团</th>
+                <th>开发类型</th>
                 <th>公司性质</th>
-                <th>内外团归属</th>
-                <th>合同期限</th>
-
-                <th>开票税点</th>
-                <th>账户名</th>
-                <th>开户行</th>
-                <th>银行账号</th>
-                <th>是否签署合同</th>
-
-                <th>支付宝真实姓名</th>
-                <th>支付宝账号</th>
-
-                <th>备注</th>
-
-                <th>会长账号</th>
                 <th>结算周期</th>
+                <th>会长账号</th>
+
+                <th>市场专员</th>
+                <th>押金</th>
+                <th>原包名</th>
+                <th>现包名</th>
                 <th>产品类型</th>
-                <th>游戏名称</th>
-                <th colspan="2">合作方分成比例</th>
+                <th colspan="2">推广分成比例</th>
+                <th colspan="2">CP分成比例</th>
             </tr>
-            </thead>
+        </thead>
 
-            <!-- 列表 -->
-            <tbody>
-            <empty name ="listData">
+        <!-- 列表 -->
+        <tbody>
+            <empty name="listData">
                 <td colspan="99" class="text-center">aOh! 暂时还没有内容!</td>
                 <else />
                 <volist name="listData" id="data" key="companykey">
                     <tr>
                         <td rowspan="{$data.row}">{$data.company_name}</td>
-                        <td rowspan="{$data.row}">{$data.platform_name}</td>
-                        <td rowspan="{$data.row}">{$data.company_type}</td>
+                        <td rowspan="{$data.row}">{$data.platform_name|default="--"}</td>
                         <td rowspan="{$data.row}">{$data.company_belong}</td>
-                        <td rowspan="{$data.row}">{$data.contact_begin} - {$data.contact_end}</td>
+                        <td rowspan="{$data.row}">{$data.develop_type}</td>
 
-                        <td rowspan="{$data.row}">{$data.fax_ratio}%</td>
-                        <td rowspan="{$data.row}">{$data.bank_address}</td>
-                        <td rowspan="{$data.row}">{$data.bank_name}</td>
-                        <td rowspan="{$data.row}">&nbsp;{$data.bank_card}</td>
-                        <td rowspan="{$data.row}">{$data.is_sign_contact}</td>
+                        <td rowspan="{$data.row}">{$data.company_type}</td>
 
-                        <td rowspan="{$data.row}">{$data.ali_user}</td>
-                        <td rowspan="{$data.row}">{$data.ali_account}</td>
+                        <td rowspan="{$data.row}">{$data.settlement_type}</td>
+                        <notempty name="data.list">
+                            <td rowspan="{$data['list'][0]['row']}">{$data['list'][0]['account']|default="--"}</td>
+                            <td rowspan="{$data['list'][0]['row']}">
+                                {$data['list'][0]['market_admin_username']|default="--"}</td>
+                            <td rowspan="{$data['list'][0]['row']}">{$data['list'][0]['pay_type']|default="--"}</td>
 
-                        <td rowspan="{$data.row}">{$data.content}</td>
+                                <notempty name="data['list'][0]['list']">
+                                    <td rowspan="{$data['list'][0]['list'][0]['row']}">
+                                        {$data['list'][0]['list'][0]['original_package_name']|default="--"}</td>
+                                    <td rowspan="{$data['list'][0]['list'][0]['row']}">
+                                        {$data['list'][0]['list'][0]['relation_game_name']|default="--"}</td>
+                                    <td rowspan="{$data['list'][0]['list'][0]['row']}">
+                                        {$data['list'][0]['list'][0]['game_type_name']|default="--"}</td>
 
-                        <notempty name="data.list">
-                            <foreach name="data['list']" item="promote" key="promotekey">
-                                <if condition="$promotekey gt 0">
-                                    <tr>
-                                        <td rowspan="{$promote['row']}"> &nbsp;{$promote['account']}</td>
-                                        <td rowspan="{$promote['row']}"> {$promote['settlement_type']}</td>
-                                        <foreach name="promote['list']" item="game" key="gamekey">
-                                            <if condition="$gamekey gt 0">
-                                                <tr>
-                                                    <td rowspan="{$game['row']}">{$game['game_type_name']}</td>
-                                                    <td rowspan="{$game['row']}">{$game['relation_game_name']}</td>
-                                                    <foreach name="game['turnover_ratio']" item="ratio" key="ratiokey">
-                                                        <if condition="$ratiokey gt 0">
-                                                            <tr>
-                                                                <td>{$ratio['name']}</td>
-                                                                <td>{$ratio['ratio']}</td>
-                                                            </tr>
-                                                        <else />
-                                                            <td>{$ratio['name']}</td>
-                                                            <td>{$ratio['ratio']}</td>
-                                                        </if>
-                                                    </foreach>
-                                                </tr>
-                                            <else />
-                                                <td rowspan="{$game['row']}">{$game['game_type_name']}</td>
-                                                <td rowspan="{$game['row']}">{$game['relation_game_name']}</td>
-                                                <foreach name="game['turnover_ratio']" item="ratio" key="ratiokey">
-                                                    <if condition="$ratiokey gt 0">
-                                                        <tr>
-                                                            <td>{$ratio['name']}</td>
-                                                            <td>{$ratio['ratio']}</td>
-                                                        </tr>
-                                                    <else />
-                                                        <td>{$ratio['name']}</td>
-                                                        <td>{$ratio['ratio']}</td>
-                                                    </if>
-                                                </foreach>
-                                            </if>
-                                        </foreach>
-                                    </tr>
-                                <else />
-                                    <td rowspan="{$promote['row']}"> &nbsp;{$promote['account']}</td>
-                                    <td rowspan="{$promote['row']}"> {$promote['settlement_type']}</td>
-                                    <foreach name="promote['list']" item="game" key="gamekey">
-                                        <if condition="$gamekey eq 0">
-                                            <td rowspan="{$game['row']}">{$game['game_type_name']}</td>
-                                            <td rowspan="{$game['row']}">{$game['relation_game_name']}</td>
-                                            <foreach name="game['turnover_ratio']" item="ratio" key="ratiokey">
-                                                <if condition="$ratiokey gt 0">
-                                                    <tr>
-                                                        <td>{$ratio['name']}</td>
-                                                        <td>{$ratio['ratio']}</td>
-                                                    </tr>
-                                                <else />
-                                                    <td>{$ratio['name']}</td>
-                                                    <td>{$ratio['ratio']}</td>
-                                                </if>
-                                            </foreach> 
+                                        <notempty name="data['list'][0]['list'][0]['turnover_ratio']">
+                                            <td>{$data['list'][0]['list'][0]['turnover_ratio'][0]['name']|default="--"}</td>
+                                            <td>{$data['list'][0]['list'][0]['turnover_ratio'][0]['ratio']|showPercent}</td>
+
+                                            <td>{$data['list'][0]['list'][0]['cp_ratio'][0]['name']|default="--"}</td>
+                                            <td>{$data['list'][0]['list'][0]['cp_ratio'][0]['ratio']|showPercent}</td>
                                         <else />
+                                            <td>--</td>
+                                            <td>--</td>
+                                            <td>--</td>
+                                            <td>--</td>
+                                        </notempty>
+                                    <else />
+                                    <td>--</td>
+                                    <td>--</td>
+                                    <td>--</td>
+                                    <td>--</td>
+                                    <td>--</td>
+                                    <td>--</td>
+                                    <td>--</td>
+                                </notempty>
+                            <else />
+                            <td>--</td>
+                            <td>--</td>
+                            <td>--</td>
+                            <td>--</td>
+                            <td>--</td>
+                            <td>--</td>
+                            <td>--</td>
+                            <td>--</td>
+                        </notempty>
+                    </tr>
+
+                    <if condition="$data['list'][0]['list'][0]['row'] gt 1">
+                        <foreach name="data['list'][0]['list'][0]['turnover_ratio']" item="game_ratio" key="gamekey">
+                            <if condition="$gamekey gt 0">
+                                <tr>
+                                    <td>{$game_ratio['name']|default="--"}</td>
+                                    <td>{$game_ratio['ratio']|showPercent}</td>
+                                    
+                                    <td>{$data['list'][0]['list'][0]['cp_ratio'][$gamekey]['name']|default="--"}</td>
+                                    <td>{$data['list'][0]['list'][0]['cp_ratio'][$gamekey]['ratio']|showPercent}</td>
+
+                                </tr>
+                            </if>
+                        </foreach>
+                    </if>
+
+
+
+                    <!-- 游戏循环 -->
+                    <if condition="$data['list'][0]['row'] gt 1">
+                        <foreach name="data['list'][0]['list']" item="p_ratio" key="pkey">
+                            <if condition="$pkey gt 0">
+                                <tr>
+                                    <td rowspan="{$p_ratio['row']}">{$p_ratio['original_package_name']|default="--"}
+                                    </td>
+                                    <td rowspan="{$p_ratio['row']}">{$p_ratio['relation_game_name']|default="--"}</td>
+                                    <td rowspan="{$p_ratio['row']}">{$p_ratio['game_type_name']|default="--"}</td>
+
+                                    <notempty name="p_ratio['turnover_ratio']">
+
+                                        <td>{$p_ratio['turnover_ratio'][0]['name']|default="--"}</td>
+                                        <td>{$p_ratio['turnover_ratio'][0]['ratio']|showPercent}</td>
+
+                                        <td>{$p_ratio['cp_ratio'][0]['name']|default="--"}</td>
+                                         <td>{$p_ratio['cp_ratio'][0]['ratio']|showPercent}</td>
+                                    <else />
+                                        <td>-</td>
+                                        <td>-</td>
+                                        <td>-</td>
+                                        <td>-</td>
+                                    </notempty>
+                                </tr>
+
+                                <if condition="$p_ratio['row'] gt 1">
+                                    <foreach name="p_ratio['turnover_ratio']" item="game_ratio" key="gamekey">
+                                        <if condition="$gamekey gt 0">
                                             <tr>
-                                                <td rowspan="{$game['row']}">{$game['game_type_name']}</td>
-                                                <td rowspan="{$game['row']}">{$game['relation_game_name']}</td>
-                                                <foreach name="game['turnover_ratio']" item="ratio" key="ratiokey">
-                                                    <if condition="$ratiokey gt 0">
-                                                        <tr>
-                                                            <td>{$ratio['name']}</td>
-                                                            <td>{$ratio['ratio']}</td>
-                                                        </tr>
-                                                    <else />
-                                                        <td>{$ratio['name']}</td>
-                                                        <td>{$ratio['ratio']}</td>
-                                                    </if>
-                                                </foreach> 
+                                                <td>{$game_ratio['name']|default="--"}</td>
+                                                <td>{$game_ratio['ratio']|showPercent}</td>
+                                                <td>{$p_ratio['cp_ratio'][$gamekey]['name']|default="--"}</td>
+                                                <td>{$p_ratio['cp_ratio'][$gamekey]['ratio']|showPercent}</td>
                                             </tr>
                                         </if>
                                     </foreach>
                                 </if>
-                            </foreach>
-                        </notempty>
-                    </tr>
+                            </if>
+                        </foreach>
+                    </if>
+                    <!-- 会长循环 -->
+                    <if condition="$data['row'] gt 1">
+                        <foreach name="data['list']" item="promote" key="promotekey">
+                            <if condition="$promotekey gt 0">
+                                <tr>
+                                    <td rowspan="{$promote['row']}">{$promote['account']|default="--"}</td>
+                                    <td rowspan="{$promote['row']}">{$promote['market_admin_username']|default="--"}
+                                    </td>
+                                    <td rowspan="{$promote['row']}">{$promote['pay_type']|default="--"}</td>
+
+                                    <notempty name="promote['list']">
+                                        <td rowspan="{$promote['list']['row']}">
+                                            {$promote['list']['original_package_name']|default="--"}</td>
+                                        <td rowspan="{$promote['list']['row']}">
+                                            {$promote['list']['relation_game_name']|default="--"}</td>
+                                        <td rowspan="{$promote['list']['row']}">
+                                            {$promote['list']['game_type_name']|default="--"}</td>
+                                            <notempty name="$promote['list']['turnover_ratio']">
+                                                <td>{$promote['list']['turnover_ratio'][0]['name']|default="--"}</td>
+                                                <td>{$promote['list']['turnover_ratio'][0]['ratio']|default="--"}</td>
+                                                <td>{$promote['list']['cp_ratio'][0]['name']|default="--"}</td>
+                                                <td>{$promote['list']['cp_ratio'][0]['ratio']|showPercent}</td>
+                                            <else />
+                                                <td>--</td>
+                                                <td>--</td>
+                                                <td>--</td>
+                                                <td>--</td>
+                                            </notempty>
+                                        <else />
+                                        <td>--</td>
+                                        <td>--</td>
+                                        <td>--</td>
+                                        <td>--</td>
+                                        <td>--</td>
+                                        <td>--</td>
+                                        <td>--</td>
+                                    </notempty>
+                                </tr>
+                            </if>
+                        </foreach>
+                    </if>
+
                 </volist>
                 <tr class="data_summary">
-                    <td style="text-align: center;">汇总:</td>
-                    <td colspan="15">
+                    <td style="text-align: center;" colspan="3">汇总:</td>
+                    <td colspan="16">
                         累计推广公司数量：{$count}&#12288;&#12288;会长数量:{$promotecount}
                     </td>
                 </tr>
             </empty>
-            </tbody>
+        </tbody>
     </table>
 
-<script>
-    $(function(){
-        $("#exporttable").table2excel({
-            filename: "推广公司.xls", // do include extension
-            preserveColors: false // set to true if you want background colors and font colors preserved
-        });
+    <script>
+        $(function () {
+            $("#exporttable").table2excel({
+                filename: "推广公司.xls", // do include extension
+                preserveColors: false // set to true if you want background colors and font colors preserved
+            });
+
+            //搜索功能
+            $("#search").click(function () {
+                console.log(222);
+                var url = $(this).attr('url');
+                var query = $('.jssearch').find('input').serialize();
+                query += "&" + $('.jssearch').find('select').serialize();
+                query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, '');
+                query = query.replace(/^&/g, '');
+                if (url.indexOf('?') > 0) {
+                    url += '&' + query;
+                } else {
+                    url += '?' + query;
+                }
+                window.parent.reloadIframe(url);
+                parent.document.getElementsByTagName('iframe').src = url;
+            });
 
-    //搜索功能
-    $("#search").click(function(){
-        console.log(222);
-        var url = $(this).attr('url');
-        var query  = $('.jssearch').find('input').serialize();
-        query  += "&" + $('.jssearch').find('select').serialize();
-        query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g,'');
-        query = query.replace(/^&/g,'');
-        if ( url.indexOf('?')>0 ){
-            url += '&' + query;
-        } else {
-            url += '?' + query;
-        }
-        window.parent.reloadIframe(url);
-        parent.document.getElementsByTagName('iframe').src = url;
-    });
-
-    });
-</script>
+        });
+    </script>
 
 </body>
-</html>
+
+</html>
\ No newline at end of file