Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item

Application/Admin/Controller/CompanyStatementSetController.class.php

@@ -1393,6 +1393,10 @@ class CompanyStatementSetController extends Controller {
                                 $tratio  = $tmp_game_ratio['ratio'];
                             }
 						}else{
+							$turnover_type = $this->getTurnoverType($p_info['relation_game_id'],$k,$begintime,$endtime);
+							if ($turnover_type == 2) {
+								continue;
+							}
 							//补点
 							$tratio1  =$this->getTurnoverRatio($p_info['all_pay_amount'],$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']);
 							$tratio2  =$tmp_game_ratio['ratio'];
@@ -1434,6 +1438,10 @@ class CompanyStatementSetController extends Controller {
 
 
 							}else{
+								$turnover_type = $this->getTurnoverType($p_info['relation_game_id'],$k,$begintime,$endtime);
+								if ($turnover_type == 2) {
+									continue;
+								}
 								//补点
 								$tratio1  =$this->getTurnoverRatio($p_info['all_pay_amount'],$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']);
 								$tratio2  =$tmp_game_ratio['ratio'];