下游公司cp比例修改

Application/Admin/Controller/PromoteCompanyController.class.php

@@ -1448,22 +1448,77 @@ class PromoteCompanyController extends ThinkController
             ->order("begin_total_amount asc")
             ->select();
         $parseGameRadiores = array();//合作方分成比例
+
         foreach ($gameradiores as $key =>$val) {
             $val['row'] = 1;
             if ($val['begin_total_amount'] == 0) {
-                $val['name'] = '默认比例';
+
+                $val['name'] = "0.00≤月流水≤";
+
+//                $val['name'] = '默认比例';
                 if (isset($parseGameRadiores[$val['game_id']])) {
                     $parseGameRadiores[$val['game_id']] = [];
                 }
+//                if ($val['game_id']==197) {
+//                    dump($gameradiores[$key+1]['begin_total_amount']);
+//                }
             } else {
+//                if ($val['game_id']==197) {
+//                    dump($gameradiores[$key+1]['begin_total_amount']);
+//                }
+//                if($val['instanceof']=='1'){
+//                    $val['name']="月流水≥".$val['begin_total_amount'];
+//                }else{
+//                    $val['name']="月流水＞".$val['begin_total_amount'];
+//                }
                 if($val['instanceof']=='1'){
-                    $val['name']="月流水≥".$val['begin_total_amount'];
+                    if ($gameradiores[$key+1]['begin_total_amount']) {
+                        $val['name']=$val['begin_total_amount']."≤月流水<".$gameradiores[$key+1]['begin_total_amount'];
+                    } else {
+                        $val['name']=$val['begin_total_amount']."≤月流水≤∞";
+                    }
+
+//                    $val['name']="月流水≥".$val['begin_total_amount'];
                 }else{
-                    $val['name']="月流水＞".$val['begin_total_amount'];
+
+                    if($gameradiores[$key+1]['begin_total_amount']!=0) {
+
+                        if ($gameradiores[$key+1]['instanceof'] == '1') {
+                            $val['name']=$val['begin_total_amount']."<月流水<".$gameradiores[$key+1]['begin_total_amount'];
+                        } else {
+                            $val['name']=$val['begin_total_amount']."≤月流水<".$gameradiores[$key+1]['begin_total_amount'];
+                        }
+
+
+                    } else {
+                        if ($gameradiores[$key+1]['instanceof'] == '1') {
+                            $val['name']=$val['begin_total_amount']."<月流水≤∞";
+                        } else {
+                            $val['name']=$val['begin_total_amount']."≤月流水≤∞";
+                        }
+
+                    }
+
+//                    $val['name']="月流水＞".$val['begin_total_amount'];
                 }
             }
             $parseGameRadiores[$val['game_id']][] =['name'=>$val['name'],"ratio"=>floatval($val['ratio'])];
         }
+
+        foreach ($parseGameRadiores as $key => $value) {
+
+            foreach ($value as $k => $v) {
+
+                if ($value[$k+1] && $k==0) {
+                    $parseGameRadiores[$key][$k]['name'] .= number_format(substr($value[$k+1]['name'],0,strpos($value[$k+1]['name'], '.')),'2','.','');
+                } elseif($k==0) {
+                    $parseGameRadiores[$key][$k]['name'] .= '∞';
+                }
+
+            }
+
+        }
+
         return $parseGameRadiores;
     }
     //设置比例阶梯

Application/Admin/View/CpJuheCompany/export.html

@@ -155,8 +155,8 @@
               <td rowspan="{$vo['sec_rowspan'][0]}">{$vo['game_name'][0]|default="------"}</td>
               <td rowspan="{$vo['sec_rowspan'][0]}">{$vo['game_type'][0]|default="------"}</td>
               <td rowspan="{$vo['sec_rowspan'][0]}">{$vo['withdraw_type'][0]|default="------"}</td>
-              <td rowspan='1'>默认</td>
-              <td rowspan='1'>{$vo['rate_data'][0][0]['exploitation_rate']|default="0"}</td>
+              <td rowspan='1'>{$vo['rate_data'][0][0]['exploitation_name']|default="0<=流水<=∞"}</td>
+              <td rowspan='1'>{$vo['rate_data'][0][0]['exploitation_rate']|default="------"}</td>
               <td rowspan="{$vo.rowspan}">{$vo.bank_user|default="------"}</td>
               <td rowspan="{$vo.rowspan}">{$vo.bank_card|default="------"}</td>
               <td rowspan="{$vo.rowspan}">{$vo.bank_name|default="------"}</td>
@@ -203,7 +203,7 @@
                 </tr>
               </if>
               <volist name="vo['rate_data'][$index-1]" id="rate" key="rate_index">
-                <if condition="$rate['exploitation_name'] neq '默认'">
+                <if condition="$rate_index gt 1">
                   <tr>
                     <td rowspan='1'>{$rate.exploitation_name}</td>
                     <td rowspan='1'>{$rate.exploitation_rate}</td>