no message

app/Http/Controllers/Game/ActivityController.php

@@ -548,7 +548,7 @@ class ActivityController extends Controller
                 'completed' => $completed,
                 'status' => $completed ? 1 : 0,
                 'status_text' => $completed ? '已完成' : '未完成',
-                'progress' => $taskData[$progressKey] ?? 0,
+                'progress' => min($taskData[$progressKey] ?? 0,$taskCfg['target']),
                 'target' => $taskCfg['target']
             ];
         }
@@ -586,7 +586,7 @@ class ActivityController extends Controller
                         'completed' => $completed,
                         'status' => $completed ? 1 : 0,
                         'status_text' => $completed ? '已完成' : '未完成',
-                        'progress' => $taskData[$progressKey] ?? 0,
+                        'progress' => min($taskData[$progressKey] ?? 0,$taskCfg['target']),
                         'target' => $taskCfg['target']
                     ];
                 }, $taskConfig['stage2']['tasks'])
@@ -612,7 +612,7 @@ class ActivityController extends Controller
                         'reward_status' => $rewardStatus,
                         'reward_status_text' => ['不能领取', '待领取', '可重复领取'][$rewardStatus],
                         'can_claim' => $rewardStatus === 1,
-                        'progress' => $taskData[$progressKey] ?? 0,
+                        'progress' => min($taskData[$progressKey] ?? 0,$taskCfg['target']),
                         'target' => $taskCfg['target']
                     ];
                 }, $taskConfig['stage3']['tasks'])
@@ -839,21 +839,21 @@ class ActivityController extends Controller
                 'tasks' => [
                     [
                         'id' => 'stage1_task1',
-                        'title' => '签到一次',
+                        'title' => 'Claim daily bonus once',
                         'type' => 'sign_in',
                         'target' => 1,
                         'progress_key' => 'sign_in_count'
                     ],
                     [
                         'id' => 'stage1_task2',
-                        'title' => '下注金额达到100',
+                        'title' => 'Bet amount reaches 100',
                         'type' => 'bet_amount',
                         'target' => 100,
                         'progress_key' => 'total_bet'
                     ],
                     [
                         'id' => 'stage1_task3',
-                        'title' => '再充值一次',
+                        'title' => 'Deposit once more',
                         'type' => 'recharge',
                         'target' => 1,
                         'progress_key' => 'recharge_count'
@@ -865,21 +865,21 @@ class ActivityController extends Controller
                 'tasks' => [
                     [
                         'id' => 'stage2_task1',
-                        'title' => '玩六款游戏',
+                        'title' => 'Try 6 different games',
                         'type' => 'play_games',
                         'target' => 6,
                         'progress_key' => 'played_games_count'
                     ],
                     [
                         'id' => 'stage2_task2',
-                        'title' => '下注金额达到3000',
+                        'title' => 'Bet amount reaches 3000',
                         'type' => 'bet_amount',
                         'target' => 3000,
                         'progress_key' => 'total_bet'
                     ],
                     [
                         'id' => 'stage2_task3',
-                        'title' => '发起一次邀请',
+                        'title' => 'Start inviting once',
                         'type' => 'invite',
                         'target' => 1,
                         'progress_key' => 'invite_count'
@@ -890,7 +890,7 @@ class ActivityController extends Controller
                 'tasks' => [
                     [
                         'id' => 'stage3_task1',
-                        'title' => '下注金额达到6000',
+                        'title' => 'Bet amount reaches 6000',
                         'type' => 'bet_amount',
                         'target' => 6000,
                         'reward' => 20,
@@ -898,7 +898,7 @@ class ActivityController extends Controller
                     ],
                     [
                         'id' => 'stage3_task2',
-                        'title' => '下注金额达到12000',
+                        'title' => 'Bet amount reaches 12000',
                         'type' => 'bet_amount',
                         'target' => 12000,
                         'reward' => 40,
@@ -963,7 +963,7 @@ class ActivityController extends Controller
 
         // 获取充值次数
         $rechargeCount = $userTotalStatistics?$userTotalStatistics->RechargeTimes:0;
-        $taskData['recharge_count'] = $rechargeCount;
+        $taskData['recharge_count'] = min(max($rechargeCount-1,0),1);
 
         // 获取玩过的游戏数量（去重）
         $playedGames = DB::table('QPRecordDB.dbo.RecordUserGameCount')
@@ -1005,7 +1005,7 @@ class ActivityController extends Controller
         // 阶段1任务检查
         $taskData['stage1_task1'] = $taskData['sign_in_count'] >= 1;
         $taskData['stage1_task2'] = $taskData['total_bet'] >= 100;
-        $taskData['stage1_task3'] = $taskData['recharge_count'] >= 2;
+        $taskData['stage1_task3'] = $taskData['recharge_count'] >= 1;
         $taskData['stage1_completed'] = $taskData['stage1_task1'] && 
                                          $taskData['stage1_task2'] && 
                                          $taskData['stage1_task3'];

app/Services/OrderServices.php

@@ -399,7 +399,7 @@ class  OrderServices
                 DB::connection('write')->table('QPRecordDB.dbo.RecordUserTotalStatistics')
                     ->where('UserID', $user_id)
                     ->update([
-                        'Winning' => 0,
+                        'WinInning' => 0,
                         'LostInning' => 0,
                         'Revenue' => 0,
                         'WinScore' => 0,
@@ -407,7 +407,7 @@ class  OrderServices
                         'Handsel' => 0,
                         'DrawBase' => 0,
                         'TotalBet' => 0,
-                        'TotalScore' => 0,
+//                        'TotalScore' => 0,
                         'MaxDrawBase' => 0,
                         'MaxScore' => 0,
                         'MaxWinScore' => 0,
@@ -517,12 +517,25 @@ class  OrderServices
         ];
         
         DB::connection('write')->table('agent.dbo.first_pay_gift_records')->insert($data);
+
+        $dayRewardsTotal = $dayRewards ? round($dayRewards['total_bonus'] * $payAmt / 100, 2) : 0;
+        $bettingBonusTotal = $bettingBonus ? round($bettingBonus['total_bonus'] * $payAmt / 100, 2) : 0;
+        $bettingTaskTotal = $bettingTask ? round($bettingTask['total_bonus'] * $payAmt / 100, 2) : 0;
         
         \Log::info('首充礼包记录创建成功', [
             'user_id' => $user_id,
             'gift_id' => $gift_id,
             'pay_amount' => $payAmt,
-            'total_bonus' => $totalBonusAmount
+            'total_bonus' => $totalBonusAmount,
+            'rw' => [
+                $dayRewardsTotal,
+                $bettingBonusTotal,
+                $bettingTaskTotal,
+                round($dayRewards['total_bonus'] * $payAmt / 100, 2),
+                round($bettingBonus['total_bonus'] * $payAmt / 100, 2),
+                round($bettingTask['total_bonus'] * $payAmt / 100, 2)
+            ]
+
         ]);
     }
 }