优化下游公司导出及汇总

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -296,8 +296,16 @@ class CompanyStatementPoolController extends ThinkController
         unset($pl);
         foreach($infolist as $k=>&$v){
             $v['statement_info'] = json_decode($v['statement_info'],true);
+            $v['company_info'] = json_decode($v['company_info'],true);
             $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']);
             $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']);
+            if( isset($v['verify_status'])){
+                if( $v['verify_status'] ==2 ){
+                    $v['is_payment'] = 2; //不打款
+                }else{
+                    $v['is_payment'] = 1;
+                }
+            }
             $cline = $line+1;
             if($is_export){
                 $v['statement_money_exp'] = "=";
@@ -351,7 +359,7 @@ class CompanyStatementPoolController extends ThinkController
             $count["reward"] = "=".trim($count["reward_exp"],"+");
             $count["statement_money"] = "=".trim($count["statement_money_exp"],"+");
         }
-
+        // dd($infolist);
         $this->assign("data",$infolist);
         $this->assign("count",$count);
         $this->assign("is_export",$is_export);

Application/Admin/View/CompanyStatementPool/viewPcPool.html

@@ -109,7 +109,18 @@
                         <th>合计/元</th>
                         <th>对账人</th>
                         <th>结算日期</th>
+
+
+                        <th>户名</th>
+                        <th>帐号</th>
+                        <th>开户行</th>
+                        <th>是否支付宝打款</th>
+                        <th>是否结算</th>
+
                         <th>备注</th>
+                        <if condition="!$is_export">
+                            <th>操作</th>
+                        </if>
                     </tr>
                 </thead>
                 <tbody id="statementShow">
@@ -119,16 +130,40 @@
                             <td rowspan="{$com.statement_count}">{$com.company_name}</td>
                             <td>{$com['statement_info'][0]['game_name']}</td>
                             <td>{$com['statement_info'][0]['pay_amount']}</td>
-                            <td>{$com['statement_info'][0]['ratio']}%</td>
-                            <td>{$com['statement_info'][0]['increment_ratio']}%</td>
-                            <td>{$com['statement_info'][0]['fax_ratio']}%</td>
+                            <td>{$com['statement_info'][0]['ratio']|showNumPercent}</td>
+                            <td>{$com['statement_info'][0]['increment_ratio']|showNumPercent}</td>
+                            <td>{$com['statement_info'][0]['fax_ratio']|showNumPercent}</td>
                             <td>{$com['statement_info'][0]['d_statement_money']}</td>
-                            <td rowspan="{$com.statement_count}">{$com.fine}</td>
-                            <td rowspan="{$com.statement_count}">{$com.reward}</td>
-                            <td rowspan="{$com.statement_count}">{$com.statement_money}</td>
+                            <td rowspan="{$com.statement_count}">{$com['fine']-0}</td>
+                            <td rowspan="{$com.statement_count}">{$com['reward']-0}</td>
+                            <td rowspan="{$com.statement_count}">{$com['statement_money']-0}</td>
                             <td rowspan="{$com.statement_count}">{$com.settlement_contact}</td>
                             <td>{$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']}</td>
+
+
+                            <if condition="$com['is_payment'] eq 2">
+                                <td rowspan="{$com.statement_count}">{$com.company_info.payee_name}</td>
+                                <td rowspan="{$com.statement_count}">&nbsp;{$com.company_info.bank_account}</td>
+                                <td rowspan="{$com.statement_count}">{$com.company_info.opening_bank}</td>
+                            </if>
+
+                            <if condition="$com['is_payment'] eq 1">
+                                <td rowspan="{$com.statement_count}">{$com.company_info.ali_user}</td>
+                                <td rowspan="{$com.statement_count}">{$com.company_info.ali_account}</td>
+                                <td rowspan="{$com.statement_count}"></td>
+                            </if>
+                            <td rowspan="{$com.statement_count}"><if condition="$com['is_payment'] eq 1">是 <else /> 否 </if></td>
+                            <td rowspan="{$com.statement_count}"><if condition="$com['st'] eq 0">否 <else /> 是 </if></td>
+
                             <td rowspan="{$com.statement_count}">{$com.renark}</td>
+
+                            <if condition="!$is_export">
+                                <td rowspan="{$com.statement_count}">
+                                    <if condition="($com['st'] eq 1 ) AND ($pool_status lt 1)">
+                                        <a data-id="{$com['id']}" class='butn no_statement' style="cursor:pointer">不结算</a>
+                                    </if>
+                                </td>
+                            </if>
                         </tr>
 
                         <foreach name="com.statement_info" item="it" key="k">
@@ -136,9 +171,9 @@
                                 <tr>
                                     <td>{$it['game_name']}</td>
                                     <td>{$it['pay_amount']}</td>
-                                    <td>{$it['ratio']}%</td>
-                                    <td>{$it['increment_ratio']}%</td>
-                                    <td>{$it['fax_ratio']}%</td>
+                                    <td>{$it['ratio']|showNumPercent}</td>
+                                    <td>{$it['increment_ratio']|showNumPercent}</td>
+                                    <td>{$it['fax_ratio']|showNumPercent}</td>
                                     <td>{$it['d_statement_money']}</td>
                                     <td>{$it['statement_begin_time']}-{$it['statement_end_time']}</td>
                                 </tr>
@@ -158,6 +193,14 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <if condition="!$is_export">
+                            <td></td>
+                        </if>
                     </tr>
                 </tbody>
             </table>
@@ -173,5 +216,26 @@
             });
         });
     </if>
+    $(".no_statement").on("click",function(){
+        var id = $(this).data('id');
+        $.ajax({
+            type: "POST",
+            url: "{:U('cancelStatement')}",
+            dataType: 'json',
+            async: false,
+            data: {id:id},
+            success:function(data){
+                if(data.status==1){
+                    layer.msg("<font style='color:white'>" + data.info + "</font>");
+                    setTimeout(function(){
+                        window.location.reload();
+                    },1500);
+                }else{
+                    layer.msg("<font style='color:white'>" + data.info + "</font>");
+                    return false;
+                }
+            }
+        });
+    })
 </script>
 </html>