|
|
@@ -84,9 +84,11 @@ class PayRechargeController extends Controller
|
|
|
->select('id','money','favorable_price','give')
|
|
|
->orderBy('money', 'asc')->where('status', 1)->get();
|
|
|
|
|
|
+ $vip = DB::table(TableName::QPAccountsDB() . 'YN_VIPAccount')
|
|
|
+ ->where('UserID', $user->UserID)
|
|
|
+ ->value('Recharge') ?: 0;
|
|
|
|
|
|
-
|
|
|
- $gear = Util::filterGearByDevice(\GuzzleHttp\json_encode($names));
|
|
|
+ $gear = Util::filterGearByDevice(\GuzzleHttp\json_encode($names), $vip);
|
|
|
foreach ($list as &$val) {
|
|
|
$val->favorable_price = $val->favorable_price + $val->give;
|
|
|
$val->gear = $gear;
|
|
|
@@ -132,6 +134,10 @@ class PayRechargeController extends Controller
|
|
|
->where('in_shop', 1)
|
|
|
->get();
|
|
|
|
|
|
+ $vip = DB::table(TableName::QPAccountsDB() . 'YN_VIPAccount')
|
|
|
+ ->where('UserID', $user->UserID)
|
|
|
+ ->value('Recharge') ?: 0;
|
|
|
+
|
|
|
foreach ($list as &$val) {
|
|
|
$val->favorable_price = $val->favorable_price + $val->give;
|
|
|
$val->recommend = 0;
|
|
|
@@ -139,7 +145,7 @@ class PayRechargeController extends Controller
|
|
|
$val->recommend = 1;
|
|
|
}
|
|
|
if (!empty($val->gear)) {
|
|
|
- $val->gear = Util::filterGearByDevice($val->gear);
|
|
|
+ $val->gear = Util::filterGearByDevice($val->gear, $vip);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -652,6 +658,9 @@ class PayRechargeController extends Controller
|
|
|
->get();
|
|
|
|
|
|
// $gear = \GuzzleHttp\json_encode($names);
|
|
|
+ // 注意:getFirstPayGiftData 方法需要接收 $userId 参数才能获取 $vip
|
|
|
+ // 这里暂时使用 0,因为该方法没有 $userId 参数
|
|
|
+ $vip = 0;
|
|
|
foreach ($list as &$val) {
|
|
|
$val->favorable_price = $val->favorable_price + $val->give;
|
|
|
// $val->gear = $gear;
|
|
|
@@ -660,7 +669,7 @@ class PayRechargeController extends Controller
|
|
|
$val->recommend = 1;
|
|
|
}
|
|
|
if (!empty($val->gear)) {
|
|
|
- $val->gear = Util::filterGearByDevice($val->gear);
|
|
|
+ $val->gear = Util::filterGearByDevice($val->gear, $vip);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -746,7 +755,10 @@ 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);
|
|
|
+ $vip = DB::table(TableName::QPAccountsDB() . 'YN_VIPAccount')
|
|
|
+ ->where('UserID', $user->UserID)
|
|
|
+ ->value('Recharge') ?: 0;
|
|
|
+ $gear->gear = Util::filterGearByDevice($gear->gear, $vip);
|
|
|
}
|
|
|
$result[] = $gear;
|
|
|
}
|