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

特殊补点bug修正

Application/Admin/Controller/CompanyStatementController.class.php

@@ -645,8 +645,6 @@ class CompanyStatementController extends ThinkController
         $StatementInfo  = M("company_statement_info","tab_");
         $company_info = $va['company_info'];
 
-
-
         $LackStatement = M("company_lack_statement_info","tab_");
         $no_pool_money = 300;
         //统一比例字段
@@ -806,16 +804,13 @@ class CompanyStatementController extends ThinkController
             }
 
             if (isset($v['company_info']['company_belong'])) {
-                if($v['company_info']['company_belong'] == '0') {
-                    $v['company_info']['company_relation_str'] = '内团';
-                } elseif($v['company_info']['company_belong'] == '1') {
-                    $v['company_info']['company_relation_str'] = '外团';
-                }elseif($v['company_info']['company_belong'] == '2') {
-                    $v['company_info']['company_relation_str'] = '分发联盟';
-                }elseif($v['company_info']['company_belong'] == '3') {
-                    $v['company_info']['company_relation_str'] = '无';
-                }
+                $v['company_info']['company_belong_str'] = getCompanyBlong($v['company_info']['company_belong']);
             }
+
+            if (isset($v['company_info']['develop_type'])) {
+                $v['company_info']['company_relation_str'] = getCompanyRelation($v['company_info']['develop_type']);
+            }
+
             //先分配好订单号，防止重复提交
             $tdata = [
                 "company_info"=>$v['company_info'],
@@ -1222,7 +1217,8 @@ class CompanyStatementController extends ThinkController
             $proCompany_info['taxation_rate'] = $company_data['taxation_rate'];
 
             $proCompany_info['company_belong'] = $company_data['company_belong'];
-            $proCompany_info['company_type'] =$company_data['company_type'];
+            $proCompany_info['company_type'] = $company_data['company_type'];
+            $proCompany_info['develop_type'] = $company_data['develop_type'];
             $proCompany_info['ali_user'] = $company_data['ali_user'];
             $proCompany_info['ali_account'] =$company_data['ali_account'];
             $proCompany_info['has_server_fee'] = $company_data['has_server_fee'];

Application/Admin/Controller/CompanyStatementLackController.class.php

@@ -114,7 +114,7 @@ class CompanyStatementLackController extends ThinkController
         //获取基本信息
         $dbres = $this->DBModel->where("id='{$id}'")->select();
 
-        $withdraw_type = $dbres[0]['withdraw_type'];
+        $withdraw_type = -9;
 
         $title = $dbres[0]['company_name'];
         $this->assign("title",$title);

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -216,14 +216,14 @@ class CompanyStatementPoolController extends ThinkController
             $this->viewCpPool($infolist,$is_export);
         }elseif($infolist[0]['company_type'] == 1){
             //下游公司
-            $this->viewPcPool($infolist,$is_export,$pool_info['withdraw_type']);
+            $this->viewPcPool($infolist,$is_export);
         }else{
-            $this->viewPuPool($infolist,$is_export,$pool_info['withdraw_type']);
+            $this->viewPuPool($infolist,$is_export);
         }
 
     }
     //个人汇总结算查看
-    public function viewPuPool(&$infolist,$is_export,$withdraw = 0){
+    public function viewPuPool(&$infolist,$is_export){
         $line = 1;
         $count = [];
         //获取对接人
@@ -251,7 +251,7 @@ class CompanyStatementPoolController extends ThinkController
                 
                 foreach($va['game_list'] as $key=>&$val){
                     $line ++;
-                    if($withdraw != 3) {
+                    if($v['withdraw_type'] != 3) {
                         if(isset($val['ratio'])){
                             $val['increment_ratio'] = 0;
                         }else{
@@ -260,7 +260,7 @@ class CompanyStatementPoolController extends ThinkController
                     }
 
                     if($is_export){
-                        if($withdraw != 3) {
+                        if($v['withdraw_type'] != 3) {
                             $val['sum_money'] = "=K{$line}*(L{$line}+M{$line})";
                         } else {
                             $val['sum_money'] = "=K{$line}*(M{$line})";
@@ -286,7 +286,13 @@ class CompanyStatementPoolController extends ThinkController
             }
             $v['row'] = $row;
             if($is_export){
-                $v['statement_money'] .="N{$cline}-O{$cline}";
+
+                if($v['withdraw_type'] != 3) {
+                    $v['statement_money'] .="N{$cline}-O{$cline}";
+                } else {
+                    $v['statement_money'] = substr($v['statement_money'],0,strlen($v['statement_money'])-1);
+                }
+//                dump($v['statement_money']);die();
             }
         }
 
@@ -300,7 +306,7 @@ class CompanyStatementPoolController extends ThinkController
         $this->display("CompanyStatementPool/viewPuPool");
     }
     //下游汇总结算查看
-    public function viewPcPool(&$infolist,$is_export,$withdraw = 0){
+    public function viewPcPool(&$infolist,$is_export){
         $line = 1;
         $count = [];
         //获取对接人
@@ -329,7 +335,8 @@ class CompanyStatementPoolController extends ThinkController
             $cline = $line+1;
             foreach($v['statement_info'] as $ke=>&$va){
                 $line ++;
-                if($withdraw != 3) {
+
+                if($v['withdraw_type'] != 3) {
                     if (isset($va['ratio'])) {
                         $va['increment_ratio'] = 0;
                     } else {
@@ -338,7 +345,7 @@ class CompanyStatementPoolController extends ThinkController
                 }
 
                 if($is_export){
-                    if($withdraw != 3) {
+                    if($v['withdraw_type'] != 3) {
                         $va['d_statement_money'] = "=D{$line}*(1-G{$line})*(E{$line}+F{$line})";
                     } else {
                         $va['d_statement_money'] = "=D{$line}*(F{$line})";
@@ -354,7 +361,7 @@ class CompanyStatementPoolController extends ThinkController
             $v['settlement_contact'] = $Partner[$v['company_id']];
 
             if($is_export){
-                if ($withdraw != 3) {
+                if ($v['withdraw_type'] != 3) {
                     $v['statement_money'] =  "=SUM(H{$cline}:H{$line})+J{$cline}-I{$cline}";
                 }