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

Application/Admin/Controller/CompanyStatementSetController.class.php

@@ -744,6 +744,10 @@ class CompanyStatementSetController extends Controller {
                         }
 					}else{
 						//补点
+						$turnover_type = $this->getTurnoverType($t_game_id,$k,$begintime,$endtime);
+                        if ($turnover_type == 2) {
+                            continue;
+                        }
 						$tratio1  =$this->getTurnoverRatio($game_all_payment,$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']);
 						$tratio2  =$tmp_game_ratio['ratio'];
 						$tratio = $tratio1-$tratio2+$company_ratio;
@@ -783,6 +787,10 @@ class CompanyStatementSetController extends Controller {
                                 $tratio  = $tmp_game_ratio['ratio'];
                             }
 						}else{
+							$turnover_type = $this->getTurnoverType($t_game_id,$k,$begintime,$endtime);
+							if ($turnover_type == 2) {
+								continue;
+							}
 							//补点
 							$tratio1  =$this->getTurnoverRatio($game_all_payment,$tmp_game_ratio['ratio'],$tmp_game_ratio['turnover_ratio']);
 							$tratio2  =$tmp_game_ratio['ratio'];