Tree 1 день назад
Родитель
Сommit
120660a149

+ 5 - 2
app/Http/Controllers/Game/PayRechargeController.php

@@ -825,6 +825,7 @@ class PayRechargeController extends Controller
         $todayRecharge = DB::table('agent.dbo.order')
             ->where('user_id', $user->UserID)
             ->where('pay_status', 1)
+            ->where('GiftsID', 303)
             ->where('pay_at', '>=', $todayStart)
             ->where('pay_at', '<=', $todayEnd)
             ->first();
@@ -860,6 +861,7 @@ class PayRechargeController extends Controller
                 $gear->gift_id = $gift->gift_id;
                 $gear->total_bonus = $gift->total_bonus;
                 $gear->bonus = $gift->total_bonus - 100;
+                $gear->recommend = $gift->first_pay?1:0;
                 if (!empty($gear->gear)) {
                     $gear->gear = Util::filterGearByDevice($gear->gear);
                 }
@@ -927,7 +929,7 @@ class PayRechargeController extends Controller
                 // 检查该档位今日是否已充值(使用浮点数比较,允许小数点精度差异)
                 $isCompleted = false;
                 foreach ($todayRecharges as $rechargeAmount) {
-                    if (abs($rechargeAmount - $gift->recommend) < 0.01) {
+                    if (abs($rechargeAmount/100 - $gift->recommend) < 0.01) {
                         $isCompleted = true;
                         break;
                     }
@@ -941,6 +943,7 @@ class PayRechargeController extends Controller
                 $gear->bonus = $gift->total_bonus - 100;
                 $gear->is_completed = $isCompleted; // 是否已完成
                 $gear->gear_index = $index + 1; // 档位序号(1,2,3)
+                $gear->recommend = $gift->first_pay?1:0;
                 
                 if (!empty($gear->gear)) {
                     $gear->gear = Util::filterGearByDevice($gear->gear);
@@ -1013,7 +1016,7 @@ class PayRechargeController extends Controller
             // 检查该档位是否已充值(使用浮点数比较)
             $isCompleted = false;
             foreach ($todayRecharges as $rechargeAmount) {
-                if (abs($rechargeAmount - $gift->recommend) < 0.01) {
+                if (abs($rechargeAmount/100 - $gift->recommend) < 0.01) {
                     $isCompleted = true;
                     break;
                 }

+ 1 - 0
app/Http/logic/api/WDPayLogic.php

@@ -51,6 +51,7 @@ class WDPayLogic extends BaseApiLogic
             1 => 'cashapp',
             2 => 'paypal',
             4 => 'applepay',
+            8 => 'googlepay'
         ];
 
         $wdMethod = @$payMethods[$pay_method];