Browse Source

no message

Tree 1 day ago
parent
commit
fcb69b40b7
1 changed files with 6 additions and 16 deletions
  1. 6 16
      app/Http/Controllers/Game/PayRechargeController.php

+ 6 - 16
app/Http/Controllers/Game/PayRechargeController.php

@@ -156,7 +156,7 @@ class PayRechargeController extends Controller
                     $val->recommend = 1;
                     $val->recommend = 1;
                 }
                 }
                 if (!empty($val->gear)) {
                 if (!empty($val->gear)) {
-                    $val->gear = Util::filterGearByDevice($val->gear);
+                    $val->gear = Util::filterGearByDevice($val->gear,GlobalUserInfo::toWebData($user));
                 }
                 }
             }
             }
             
             
@@ -809,12 +809,6 @@ class PayRechargeController extends Controller
         }
         }
 
 
 
 
-        $userData = null;
-        if ($user->UserID > 0) {
-            $userData = GlobalUserInfo::getGameUserInfo('UserID', $user->UserID);
-            if ($userData) $userData = GlobalUserInfo::toWebData($userData);
-        }
-
         $result = [];
         $result = [];
         
         
         // 遍历每条礼包配置,根据 recommend 关联 recharge_gear
         // 遍历每条礼包配置,根据 recommend 关联 recharge_gear
@@ -830,7 +824,7 @@ class PayRechargeController extends Controller
                 $gear->total_bonus = $gift->total_bonus;
                 $gear->total_bonus = $gift->total_bonus;
                 $gear->bonus = $gift->total_bonus - 100;
                 $gear->bonus = $gift->total_bonus - 100;
                 if (!empty($gear->gear)) {
                 if (!empty($gear->gear)) {
-                    $gear->gear = Util::filterGearByDevice($gear->gear,$userData);
+                    $gear->gear = Util::filterGearByDevice($gear->gear,GlobalUserInfo::toWebData($user));
                 }
                 }
                 $result[] = $gear;
                 $result[] = $gear;
             }
             }
@@ -895,7 +889,7 @@ class PayRechargeController extends Controller
                 $gear->bonus = $gift->total_bonus - 100;
                 $gear->bonus = $gift->total_bonus - 100;
                 $gear->recommend = $gift->first_pay?1:0;
                 $gear->recommend = $gift->first_pay?1:0;
                 if (!empty($gear->gear)) {
                 if (!empty($gear->gear)) {
-                    $gear->gear = Util::filterGearByDevice($gear->gear);
+                    $gear->gear = Util::filterGearByDevice($gear->gear,GlobalUserInfo::toWebData($user));
                 }
                 }
                 $result[] = $gear;
                 $result[] = $gear;
             }
             }
@@ -978,7 +972,7 @@ class PayRechargeController extends Controller
                 $gear->recommend = $gift->first_pay?1:0;
                 $gear->recommend = $gift->first_pay?1:0;
                 
                 
                 if (!empty($gear->gear)) {
                 if (!empty($gear->gear)) {
-                    $gear->gear = Util::filterGearByDevice($gear->gear);
+                    $gear->gear = Util::filterGearByDevice($gear->gear,GlobalUserInfo::toWebData($user));
                 }
                 }
                 $result[] = $gear;
                 $result[] = $gear;
             }
             }
@@ -1215,11 +1209,7 @@ class PayRechargeController extends Controller
             ]);
             ]);
         }
         }
 
 
-        $user = null;
-        if ($userId > 0) {
-            $user = GlobalUserInfo::getGameUserInfo('UserID', $userId);
-            if ($user) $user = GlobalUserInfo::toWebData($user);
-        }
+
 
 
         $avgRecharge = $totalRecharge / $rechargeTimes;
         $avgRecharge = $totalRecharge / $rechargeTimes;
 
 
@@ -1327,7 +1317,7 @@ class PayRechargeController extends Controller
                 $gear->total_reward_percent = $totalRewardPercent;
                 $gear->total_reward_percent = $totalRewardPercent;
                 $gear->recommend = 1;
                 $gear->recommend = 1;
                 if (!empty($gear->gear)) {
                 if (!empty($gear->gear)) {
-                    $gear->gear = Util::filterGearByDevice($gear->gear,$user);
+                    $gear->gear = Util::filterGearByDevice($gear->gear,GlobalUserInfo::toWebData($user));
                 }
                 }
                 $payload['list'] = [$gear];
                 $payload['list'] = [$gear];
             } else {
             } else {