Merge pull request '优化下游结算' (#444) from feature/more_payment into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/444

Application/Admin/Controller/MarketPerformanceSetController.class.php

@@ -263,7 +263,7 @@ class MarketPerformanceSetController extends Controller {
         $where = [
             "_string"=>"statement_begin_time between {$this->beginThismonth} and {$this->endThismonth} OR statement_end_time between {$this->beginThismonth} and {$this->endThismonth}",
             "company_type"=>2,
-            "withdraw_type"=>0
+            "withdraw_type"=>['in',"0,1"]
         ];
         $statement_pool = M("company_statement_pool","tab_")->where($where)->order("statement_begin_time desc")->select();
         //获取结算分段
@@ -285,7 +285,9 @@ class MarketPerformanceSetController extends Controller {
                 $tem['end_time'] = date("Y.m.d",$this->endThismonth);
             }
             $this->getPuAllStatement($tem,$v);
+            if($v['withdraw_type'] == "0"){
                 $this->getPuCompanyStatement($tem);//对公周结
+            }
             $date_arr[] = $tem;
         }
         //2.获取对公的下游
@@ -297,7 +299,6 @@ class MarketPerformanceSetController extends Controller {
             "withdraw_type"=>1
         ];
         $this->getPuCompanyStatement($tem);
-        
     }
     /**
      * 获取所有个人周结