Merge branch 'fix/change_statement_time' of wmtx/platform into release

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -19,7 +19,8 @@ class CompanyStatementPoolController extends ThinkController
     public $WithdrawType = [
         "0"=>"周结",
         "1"=>"月结",
-        "2"=>"下游个人补点"
+        "2"=>"下游个人补点",
+        "3"=>"其他",
     ];
     public $VerifyStatus=[
         "-2"=>"拒绝打款",
@@ -174,7 +175,7 @@ class CompanyStatementPoolController extends ThinkController
 
             $v['oplist'] = $this->OpAuth($v);
         }
-        $count =  $this->DBModel->field("count(id) count,SUM(statement_money) as statement_money")->where($map)->find();
+        $count =  $this->DBModel->field("count(id) count,SUM(statement_money) as statement_money,SUM(lack_statement_money) lack_statement_money")->where($map)->find();
         // dd($count);
         $params['p'] = $page;
         $params['row'] = $row;
@@ -223,7 +224,7 @@ class CompanyStatementPoolController extends ThinkController
                 $l_ids = $pool_info['create_lack_ids'];
                 $lack_info = M("company_lack_statement_info","tab_")->field("*,'0' as st")->where("id in ({$l_ids})")->select();
 
-                $infolist += $lack_info;
+                $infolist =array_merge($infolist,$lack_info);
             }
             $this->viewPuPool($infolist,$is_export);
         }
@@ -259,15 +260,11 @@ class CompanyStatementPoolController extends ThinkController
                     }else{
                         $va['sum_money'] =  "=J{$line}*(K{$line}+L{$line})+M{$line}-N{$line}";
                     }
-                    if($v['st'] == 1){
-                        $count['sum_money_exp'] .= "O{$line}+";
-                        $count['platform_amount_exp'] .= "J{$line}+";
-                    }
+                    $count['sum_money_exp'] .= "O{$line}+";
+                    $count['platform_amount_exp'] .= "J{$line}+";
                 }else{
-                    if($v['st'] == 1){
-                        $count['platform_amount'] += $va['pay_amount'];
-                        $count['sum_money'] +=  $va['sum_money'];
-                    }
+                    $count['platform_amount'] += $va['pay_amount'];
+                    $count['sum_money'] +=  $va['sum_money'];
                 }
             }
             $v['statement_count'] = count($v['statement_info']);

Application/Admin/View/CompanyStatementPool/lists.html

@@ -157,7 +157,7 @@
                         <th>结算周期</th>
                         <th>是否打款</th>
                         <th>结算金额</th>
-                        <th>结算流水</th>
+                        <!-- <th>结算流水</th> -->
                         <th>不结算金额</th>
                         <th>创建记录</th>
                         <th>审批状态</th>
@@ -184,7 +184,7 @@
                                 <td>{$data.withdraw_type}</td>
                                 <td>{$data.is_payment_str}</td>
                                 <td>{$data.statement_money}</td>
-                                <td>{$data.platform_amount}</td>
+                                <!-- <td>{$data.platform_amount}</td> -->
                                 <td>{$data.lack_statement_money}</td>
                                 <td>{$data.create}</td>
                                 <td>
@@ -217,7 +217,7 @@
                                 </td>
                             </tr>
                         </volist>
-                        <tr><td style="line-height: 42px;">合计</td><td colspan="13" style="line-height: 42px;">结算总金额:&nbsp;{$count.statement_money}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>
+                        <tr><td style="line-height: 42px;">合计</td><td colspan="13" style="line-height: 42px;">结算总金额:&nbsp;{$count.statement_money}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;不结算总金额:{$count.lack_statement_money}&nbsp;&nbsp;&nbsp;</td></tr>
                     </notemtpy>
                     </tbody>
                 </table>

Application/Admin/View/CompanyStatementPool/viewPuPool.html

@@ -193,7 +193,7 @@
                         </foreach>
                     </foreach>
                     <tr>
-                        <td colspan=9 >合计(仅统计结算公司):</td>
+                        <td colspan=9 >合计:</td>
                         <td>{$count.platform_amount|default=0}</td>
                         <td></td>
                         <td></td>