|
|
@@ -799,6 +799,13 @@ class PayRechargeController extends Controller
|
|
|
return apiReturnFail(['web.gift.bankruptcy_gift_not_exists', __('web.gift.bankruptcy_gift_not_exists')]);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ $userData = null;
|
|
|
+ if ($user->UserID > 0) {
|
|
|
+ $userData = GlobalUserInfo::getGameUserInfo('UserID', $user->UserID);
|
|
|
+ if ($userData) $userData = GlobalUserInfo::toWebData($userData);
|
|
|
+ }
|
|
|
+
|
|
|
$result = [];
|
|
|
|
|
|
// 遍历每条礼包配置,根据 recommend 关联 recharge_gear
|
|
|
@@ -814,7 +821,7 @@ class PayRechargeController extends Controller
|
|
|
$gear->total_bonus = $gift->total_bonus;
|
|
|
$gear->bonus = $gift->total_bonus - 100;
|
|
|
if (!empty($gear->gear)) {
|
|
|
- $gear->gear = Util::filterGearByDevice($gear->gear);
|
|
|
+ $gear->gear = Util::filterGearByDevice($gear->gear,$userData);
|
|
|
}
|
|
|
$result[] = $gear;
|
|
|
}
|
|
|
@@ -1191,6 +1198,12 @@ class PayRechargeController extends Controller
|
|
|
]);
|
|
|
}
|
|
|
|
|
|
+ $user = null;
|
|
|
+ if ($userId > 0) {
|
|
|
+ $user = GlobalUserInfo::getGameUserInfo('UserID', $userId);
|
|
|
+ if ($user) $user = GlobalUserInfo::toWebData($user);
|
|
|
+ }
|
|
|
+
|
|
|
$avgRecharge = $totalRecharge / $rechargeTimes;
|
|
|
|
|
|
// 4. 按规则选择礼包金额
|
|
|
@@ -1312,7 +1325,7 @@ class PayRechargeController extends Controller
|
|
|
$gear->total_reward_percent = $totalRewardPercent;
|
|
|
$gear->recommend = 1;
|
|
|
if (!empty($gear->gear)) {
|
|
|
- $gear->gear = Util::filterGearByDevice($gear->gear);
|
|
|
+ $gear->gear = Util::filterGearByDevice($gear->gear,$user);
|
|
|
}
|
|
|
$payload['list'] = [$gear];
|
|
|
} else {
|