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

@@ -261,12 +261,12 @@ class CompanyStatementPoolController extends ThinkController
 
                     if($is_export){
                         if($v['withdraw_type'] != 3) {
-                            $val['sum_money'] = "=J{$line}*(K{$line}+L{$line})";
+                            $val['sum_money'] = "=K{$line}*(L{$line}+M{$line})";
                         } else {
-                            $val['sum_money'] = "=J{$line}*(L{$line})";
+                            $val['sum_money'] = "=K{$line}*(M{$line})";
                         }
 //                        $val['sum_money'] =  "=J{$line}*(K{$line}+L{$line})";
-                        $v['statement_money'] .= "M{$line}+";
+                        $v['statement_money'] .= "N{$line}+";
                     }else{
                         $count['platform_amount'] += $val['pay_amount'];
                         $count['sum_money'] +=  $val['sum_money'];
@@ -291,8 +291,8 @@ class CompanyStatementPoolController extends ThinkController
         }
 
         if($is_export){
-            $count["platform_amount"] = "=SUM(J2:J".$line.")";
-            $count["sum_money"] = "=SUM(P2:P".$line.")";
+            $count["platform_amount"] = "=SUM(K2:K".$line.")";
+            $count["sum_money"] = "=SUM(Q2:Q".$line.")";
         }
         $this->assign("data",$infolist);
         $this->assign("count",$count);

Application/Admin/Controller/CompanyStatementSetController.class.php

@@ -1165,6 +1165,7 @@ class CompanyStatementSetController extends Controller {
 			$company_info = [
 				'account'=>$v['account'],
 				"company_relation_str"=>$v['company_relation_str'],
+				"company_belong_str"=>$v['company_belong_str'],
 				"company_type_str"=>$v['company_type_str'],
 				"nickname"=>$v['nickname'],
 				"payee_name"=>$v['payee_name'],
@@ -1321,7 +1322,8 @@ class CompanyStatementSetController extends Controller {
 				->where("pc.id = {$company_id}")
 				->find();
 		$company = array_merge($company_info,$pl);
-		$company['company_relation_str'] =getCompanyBlong($company['company_belong']).getCompanyRelation($company['company_relation']);
+		$company['company_relation_str'] =getCompanyRelation($company['company_relation']);
+		$company['company_belong_str'] =getCompanyBlong($company['company_belong']);
 		$company['company_type_str'] = "个人";
 		return $company;
 		

Application/Admin/View/CompanyStatementPool/viewPuPool.html

@@ -102,7 +102,10 @@
                         <th>序号</th>
                         <th>下游名称</th>
                         <th>会长账号</th>
-                        <th>下游类型</th>
+
+                        <th>内外团</th>
+                        <th>开发类型</th>
+
                         <th>市场专员</th>
                         <th>下游性质</th>
                         <th>产品</th>
@@ -143,7 +146,9 @@
                                 <td>-</td>
                             </notempty>
                             
+                            <td rowspan="{$com.row}">{$com.company_info.company_belong_str}</td>
                             <td rowspan="{$com.row}">{$com.company_info.company_relation_str}</td>
+
                             <td rowspan="{$com.row}">{$com.company_info.nickname}</td>
                             <td rowspan="{$com.row}">{$com.company_info.company_type_str}</td>
 
@@ -263,7 +268,7 @@
                         </notempty>
                     </foreach>
                     <tr>
-                        <td colspan=9 >合计:</td>
+                        <td colspan=10 >合计:</td>
                         <td>{$count.platform_amount}</td>
                         <td></td>
                         <td></td>