Merge branch 'feature/add_item_other' of wmtx/platform into release

特殊比例申请比例限制提交

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -822,12 +822,15 @@ class CompanyStatementPoolController extends ThinkController
 
             $cline = $line+1;
             foreach($v['statement_info'] as $ke=>&$va){
+                // dd($va);
                 $line ++;
                 $va['company_ratio'] = 100-$va['ratio'];
                 if($is_export){
-                    $va['d_statement_money'] =  "=ROUND(F{$line}*G{$line},2)";
+                    $va['d_statement_money'] =  "=ROUND(F{$line}*(1-I{$line})*G{$line}*(1-J{$line}),2)";//=ROUND(F3*(1-I3)*G3*(1-J3),2)
                 }else{
-                    $va['d_statement_money'] =  round($va['pay_amount']*$va['ratio']/100,2);
+
+                    $va['d_statement_money'] =  round($va['pay_amount']*(100-$va['promote_ratio'])*$va['ratio']*(100-$va['fax_ratio'])/1000000,2);
+
                     $count['platform_amount'] += $va['pay_amount'];
                     $count['platform_amount2'] += $va['pay_amount'];
                     $count['d_statement_money'] +=  $va['d_statement_money'];

Application/Admin/Controller/CompanyStatementSetController.class.php

@@ -872,11 +872,10 @@ class CompanyStatementSetController extends Controller {
 				continue;
 			}
 			if($add_data['platform_amount'] == 0){
-				return;		
+				continue;		
 			}
-			// dd($add_data);
 			//添加
-			if($recount && $company_id !== false){
+			if($recount === true && $company_id !== false){
 				//非重算
 				return $add_data;
 			}

Application/Admin/Model/CompanyGameRatioModel.class.php

@@ -24,12 +24,12 @@ class CompanyGameRatioModel extends Model
 		for ($i=0; $i < count($tmp_g); $i++) { 
             $game_id = $tmp_g[$i];
             if ($is_inside){
-                $game_ratio[$game_id] = [
+                $game_ratio[$game_id] = [[
                   "begintime" => $begintime,
                     "endtime"=>$endtime,
                     "ratio"=>0,
                     "turnover_ratio"=>''
-                ];
+                ]];
             }else{
                 $game_ratio[$game_id] = $this->getGameRadio($company_id,$game_id,$company_belong,$begintime,$endtime);
             }

Application/Admin/View/CompanyGameRatio/addRatio.html

@@ -315,10 +315,10 @@ $(function(){
         var momday = getMonday();
 
         //判断日期是否小于当周周一
-        if (momday > cres.begin_time) {
+        // if (momday > cres.begin_time) {
-          layer.msg("配置的开始日期不能小于当周周一", {icon: 2});
+        //   layer.msg("配置的开始日期不能小于当周周一", {icon: 2});
-          return false;
+        //   return false;
-        }
+        // }
 
 
         if(!flag){