Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage

 Conflicts:

	Application/Admin/Controller/CompanyStatementPoolController.class.php

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -119,10 +119,10 @@ class CompanyStatementPoolController extends ThinkController
 
             $v['company_type_str'] = $this->CompanyType[$v['company_type']];
             $v['is_payment_str'] = $this->IsPayment[$v['is_payment']];
-            $v['can_export'] = $v['statement_money'] == 0 ? "0" : '1'; 
-            if($v['company_type'] == 2){
+            // $v['can_export'] = $v['platform_amount'] == 0 ? "0" : '1';
+            // if($v['company_type'] == 2){
                 $v['can_export'] = 1;
-            }
+            // }
 
             $v['op_time'] = date('Y.m.d H:i:s',$v['op_time']);
             $v["valid"] = "{$v['statement_begin_time']}-{$v['statement_end_time']}";
@@ -327,9 +327,6 @@ class CompanyStatementPoolController extends ThinkController
                 }
             }
             $cline = $line+1;
-            if($is_export){
-                $v['statement_money_exp'] = "=";
-            }
             foreach($v['statement_info'] as $ke=>&$va){
                 $line ++;
                 if($withdraw != 3) {
@@ -341,7 +338,6 @@ class CompanyStatementPoolController extends ThinkController
                 }
 
                 if($is_export){
-                    $v['statement_money_exp'] .= "H{$line}+";
                     if($withdraw != 3) {
                         $va['d_statement_money'] = "=D{$line}*(1-G{$line})*(E{$line}+F{$line})";
                     } else {
@@ -359,8 +355,7 @@ class CompanyStatementPoolController extends ThinkController
 
             if($is_export){
                 if ($withdraw != 3) {
-                    $v['statement_money_exp'] .= "J{$cline}-I{$cline}";
-                    $v['statement_money'] =  $v['statement_money_exp'];
+                    $v['statement_money'] =  "=SUM(H{$cline}:H{$line})+J{$cline}-I{$cline}";
                 }
 
 
@@ -417,14 +412,10 @@ class CompanyStatementPoolController extends ThinkController
             }
 
             $cline = $line+1;
-            if($is_export){
-                $v['statement_money_exp'] = "=";
-            }
             foreach($v['statement_info'] as $ke=>&$va){
                 $line ++;
                 $va['company_ratio'] = 100-$va['ratio'];
                 if($is_export){
-                    $v['statement_money_exp'] .= "K{$line}+";
                     $va['d_statement_money'] =  "=F{$line}*G{$line}";
                 }else{
                     $va['d_statement_money'] =  round($va['pay_amount']*$va['ratio']/100,2);
@@ -435,8 +426,7 @@ class CompanyStatementPoolController extends ThinkController
             }
             $v['matche_platform'] = $Partner[$v['company_id']];
             if($is_export){
-                $v['statement_money_exp'] .= "M{$cline}-L{$cline}";
-                $v['statement_money'] =  $v['statement_money_exp'];
+                $v['statement_money'] = "=SUM(K{$cline}:K{$line})+M{$cline}-L{$cline}";
             }else{
                 $count['fine'] += $v['fine'];
                 $count['reward'] += $v['reward'];

Application/Admin/View/CompanyStatementPool/viewCpPool.html

@@ -119,8 +119,10 @@
                         <th colspan=3 style="border-right: solid 1px #b6cad2;">账户信息</th>
 
                         <th rowspan="2" style="border-right: solid 1px #b6cad2;">备注</th>
-                        <th rowspan="2" style="border-right: solid 1px #b6cad2;">操作</th>
 
+                        <if condition="!$is_export">
+                            <th rowspan="2" style="border-right: solid 1px #b6cad2;">操作</th>
+                        </if>
                     </tr>
                     <tr>
                         <th style="border-right: solid 1px #b6cad2;min-width: 50px;">合作方</th>
@@ -150,7 +152,7 @@
 
                             <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['statement_money']}</td>
                             
                             <td rowspan="{$com.statement_count}"><if condition="$com['st'] eq 0">否 <else /> 是 </if></td>
                             <td rowspan="{$com.statement_count}"><if condition="$com['is_payment'] eq 1">是 <else /> 否 </if></td>

Application/Admin/View/CompanyStatementPool/viewPcPool.html

@@ -136,7 +136,7 @@
                             <td>{$com['statement_info'][0]['d_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['statement_money']}</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>