Merge branch 'feature/user_repeat' into release

Application/Admin/Common/extend.php

@@ -2322,7 +2322,7 @@ function getrelationGameName($id) {
  *      game_id=>游戏id,
  */
 
-function getAvailableBalance($promote_id=0,$game_id=0,$server_id=0) {
+function getAvailableBalance($promote_id=0,$game_id=0,$server_id='') {
 
     if (!$promote_id||!$game_id||!$server_id) {
         return 0;
@@ -2330,7 +2330,7 @@ function getAvailableBalance($promote_id=0,$game_id=0,$server_id=0) {
 
     $availableBalanceData = M('promote_game_available_balance','tab_')
         ->field('available_balance')
-        ->where(['promote_id'=>$promote_id,'game_id'=>$game_id,'server_id'=>$server_id])
+        ->where(['promote_id'=>$promote_id,'game_id'=>$game_id,'server_name'=>$server_id])
         ->find();
 
     return $availableBalanceData['available_balance']?$availableBalanceData['available_balance']:0;

Application/Admin/Controller/TestResourceController.class.php

@@ -490,7 +490,7 @@ class TestResourceController extends ThinkController
                 }
             } else {//非新用户
 
-                $availableBalance = getAvailableBalance($data['promote_id'],$data['game_id'],$data['server_id']);
+                $availableBalance = getAvailableBalance($data['promote_id'],$data['game_id'],$data['server_name']);
 //                var_dump($availableBalance);die();
 
                 $promoteAllRecharge = sum_promote_total_money($data['promote_id']);//总充值量

Application/Home/Common/function.php

@@ -1308,7 +1308,7 @@ function recordPromoteLogs($module,$action_type) {
  *      game_id=>游戏id,
  */
 
-function getAvailableBalance($promote_id=0,$game_id=0,$server_id=0) {
+function getAvailableBalance($promote_id=0,$game_id=0,$server_id='') {
 
     if (!$promote_id||!$game_id||!$server_id) {
         return 0;
@@ -1316,7 +1316,7 @@ function getAvailableBalance($promote_id=0,$game_id=0,$server_id=0) {
 
     $availableBalanceData = M('promote_game_available_balance','tab_')
         ->field('available_balance')
-        ->where(['promote_id'=>$promote_id,'game_id'=>$game_id,'server_id'=>$server_id])
+        ->where(['promote_id'=>$promote_id,'game_id'=>$game_id,'server_name'=>$server_id])
         ->find();
 
     return $availableBalanceData['available_balance']?$availableBalanceData['available_balance']:0;

Application/Home/Controller/TestResourceController.class.php

@@ -480,7 +480,7 @@ class TestResourceController extends BaseController
                }
             } else {//非新用户
 
-                $availableBalance = getAvailableBalance($data['promote_id'],$data['game_id'],$data['server_id']);
+                $availableBalance = getAvailableBalance($data['promote_id'],$data['game_id'],$data['server_name']);
 //                var_dump($availableBalance);die();
 
               $promoteAllRecharge = sum_promote_total_money($data['promote_id']);//总充值量

Application/Home/View/default/TestResource/add.html

@@ -304,11 +304,11 @@
                 layer.msg('请选择游戏');
                 return false;
             }
-            if (server_id == 0 || server_id == '') {
+            // if (server_id == 0 || server_id == '') {
-                layer.msg('请选择区服');
+            //     layer.msg('请选择区服');
-                return false;
+            //     return false;
-
+            //
-            }
+            // }
 
             var data = $("form").serialize();
             var g_game_id = $("#game_id option:selected").attr('game-id');