diff --git a/application/admin/controller/Agent.php b/application/admin/controller/Agent.php index c37dbd6..911d240 100644 --- a/application/admin/controller/Agent.php +++ b/application/admin/controller/Agent.php @@ -158,6 +158,7 @@ class Agent extends Common{ $price_n7_n9 = Request::instance()->post('price_n7_n9'); $price_nn = Request::instance()->post('price_nn'); $price_5n = Request::instance()->post('price_5n'); + $price_bomb = Request::instance()->post('price_bomb'); $win_limit = intval(Request::instance()->post('win_limit')); $price_tc_n1 = round(Request::instance()->post('price_tc_n1'),2); @@ -306,6 +307,9 @@ class Agent extends Common{ if($price_5n <= 0){ die(json_encode(['code'=>0,'msg'=>'押五公赔率必须大于0!'])); } + if($price_bomb <= 0){ + die(json_encode(['code'=>0,'msg'=>'押四条赔率必须大于0!'])); + } if($price_tc_n1 <= 0){ die(json_encode(['code'=>0,'msg'=>'押牛一(三卡牛牛)赔率必须大于0!'])); } @@ -413,6 +417,7 @@ class Agent extends Common{ $data['price_n7_n9'] = $price_n7_n9; $data['price_nn'] = $price_nn; $data['price_5n'] = $price_5n; + $data['price_bomb'] = $price_bomb; $data['win_limit'] = $win_limit; $data['price_tc_n1'] = $price_tc_n1; $data['price_tc_n2'] = $price_tc_n2; @@ -510,6 +515,7 @@ class Agent extends Common{ $price_n7_n9 = Request::instance()->post('price_n7_n9'); $price_nn = Request::instance()->post('price_nn'); $price_5n = Request::instance()->post('price_5n'); + $price_bomb = Request::instance()->post('price_bomb'); $win_limit = Request::instance()->post('win_limit'); $price_tc_n1 = round(Request::instance()->post('price_tc_n1'),2); $price_tc_n2 = round(Request::instance()->post('price_tc_n2'),2); @@ -658,6 +664,9 @@ class Agent extends Common{ if($price_5n <= 0){ die(json_encode(['code'=>0,'msg'=>'押五公赔率必须大于0!'])); } + if($price_bomb <= 0){ + die(json_encode(['code'=>0,'msg'=>'押四条赔率必须大于0!'])); + } if($price_tc_n1 <= 0){ die(json_encode(['code'=>0,'msg'=>'押牛一(三卡牛牛)赔率必须大于0!'])); } @@ -780,6 +789,7 @@ class Agent extends Common{ $data['price_n7_n9'] = $price_n7_n9; $data['price_nn'] = $price_nn; $data['price_5n'] = $price_5n; + $data['price_bomb'] = $price_bomb; $data['win_limit'] = $win_limit; $data['price_tc_n1'] = $price_tc_n1; $data['price_tc_n2'] = $price_tc_n2; diff --git a/application/admin/controller/Betinfo.php b/application/admin/controller/Betinfo.php index 90c4387..4246428 100644 --- a/application/admin/controller/Betinfo.php +++ b/application/admin/controller/Betinfo.php @@ -104,6 +104,8 @@ class Betinfo extends Controller{ $price = $user_info['price_nn']; }elseif($winPoint == 11){ $price = $user_info['price_5n']; + }elseif($winPoint == 12){ + $price = $user_info['price_bomb']; }else{ $price = 1; } diff --git a/application/admin/controller/Pcapi.php b/application/admin/controller/Pcapi.php index 3e77189..e48c724 100644 --- a/application/admin/controller/Pcapi.php +++ b/application/admin/controller/Pcapi.php @@ -811,6 +811,7 @@ class Pcapi extends Controller{ $value['price_n7_n9'] = $user['price_n7_n9']; $value['price_nn'] = $user['price_nn']; $value['price_5n'] = $user['price_5n']; + $value['price_bomb'] = $user['price_bomb']; $value['price_tc_n1'] = $user['price_tc_n1']; $value['price_tc_n2'] = $user['price_tc_n2']; $value['price_tc_n3'] = $user['price_tc_n3']; @@ -2502,6 +2503,7 @@ class Pcapi extends Controller{ $insertData['price_n7_n9'] = $agentParent['price_n7_n9']; $insertData['price_nn'] = $agentParent['price_nn']; $insertData['price_5n'] = $agentParent['price_5n']; + $insertData['price_bomb'] = $agentParent['price_bomb']; $insertData['price_tc_n1'] = $agentParent['price_tc_n1']; $insertData['price_tc_n2'] = $agentParent['price_tc_n2']; $insertData['price_tc_n3'] = $agentParent['price_tc_n3']; @@ -2699,6 +2701,7 @@ class Pcapi extends Controller{ $insertData['price_n7_n9'] = $agentParent['price_n7_n9']; $insertData['price_nn'] = $agentParent['price_nn']; $insertData['price_5n'] = $agentParent['price_5n']; + $insertData['price_bomb'] = $agentParent['price_bomb']; $insertData['price_tc_n1'] = $agentParent['price_tc_n1']; $insertData['price_tc_n2'] = $agentParent['price_tc_n2']; $insertData['price_tc_n3'] = $agentParent['price_tc_n3']; diff --git a/application/admin/controller/Player.php b/application/admin/controller/Player.php index 1f407ae..fc50366 100644 --- a/application/admin/controller/Player.php +++ b/application/admin/controller/Player.php @@ -180,6 +180,7 @@ class Player extends Common{ $price_n7_n9 = Request::instance()->post('price_n7_n9'); $price_nn = Request::instance()->post('price_nn'); $price_5n = Request::instance()->post('price_5n'); + $price_bomb = Request::instance()->post('price_bomb'); $win_limit = Request::instance()->post('win_limit'); // 验证数据 @@ -250,6 +251,9 @@ class Player extends Common{ if($price_5n <= 0){ die(json_encode(['code'=>0,'msg'=>'押五公赔率必须大于0!'])); } + if($price_bomb <= 0){ + die(json_encode(['code'=>0,'msg'=>'押四条赔率必须大于0!'])); + } if(empty($win_limit)){ die(json_encode(['code'=>0,'msg'=>'日赢上限不能为空!'])); } @@ -306,6 +310,7 @@ class Player extends Common{ $data['price_n7_n9'] = $price_n7_n9; $data['price_nn'] = $price_nn; $data['price_5n'] = $price_5n; + $data['price_bomb'] = $price_bomb; $data['win_limit'] = $win_limit; $insert_id = Db::name('user')->insertGetId($data); if($insert_id){ @@ -392,6 +397,7 @@ class Player extends Common{ $price_n7_n9 = Request::instance()->post('price_n7_n9'); $price_nn = Request::instance()->post('price_nn'); $price_5n = Request::instance()->post('price_5n'); + $price_bomb = Request::instance()->post('price_bomb'); $win_limit = Request::instance()->post('win_limit'); // 验证数据 @@ -463,6 +469,9 @@ class Player extends Common{ if($price_5n <= 0){ die(json_encode(['code'=>0,'msg'=>'押五公赔率必须大于0!'])); } + if($price_bomb <= 0){ + die(json_encode(['code'=>0,'msg'=>'押四条赔率必须大于0!'])); + } if(empty($win_limit)){ die(json_encode(['code'=>0,'msg'=>'日赢上限不能为空!'])); } @@ -491,6 +500,7 @@ class Player extends Common{ $data['price_n7_n9'] = $price_n7_n9; $data['price_nn'] = $price_nn; $data['price_5n'] = $price_5n; + $data['price_bomb'] = $price_bomb; $data['win_limit'] = $win_limit; // 修改会员资料 diff --git a/application/admin/view/agent/agent-add.html b/application/admin/view/agent/agent-add.html index 2eb66fc..9cd5a14 100644 --- a/application/admin/view/agent/agent-add.html +++ b/application/admin/view/agent/agent-add.html @@ -343,6 +343,14 @@ +