|
|
@@ -69,7 +69,9 @@ class ActivityController extends Controller
|
|
|
{
|
|
|
$user = $request->user();
|
|
|
if (!$user) {
|
|
|
- return apiReturnFail('请先登录');
|
|
|
+// return apiReturnFail('请先登录');
|
|
|
+ return apiReturnFail(['web.activity.login_required', __('messages.web.activity.login_required')]); // 请先登录
|
|
|
+
|
|
|
}
|
|
|
|
|
|
$service = new HolidayWheelService();
|
|
|
@@ -538,7 +540,9 @@ class ActivityController extends Controller
|
|
|
->value('Recharge') ?: 0;
|
|
|
|
|
|
if ($user_recharge <= 0 &&!$request->input('is_test', 0)) {
|
|
|
- return apiReturnFail('请先充值后再查看任务-'.$userId);
|
|
|
+// return apiReturnFail('请先充值后再查看任务-'.$userId);
|
|
|
+ return apiReturnFail(['web.vip_task.recharge_first', __('messages.web.vip_task.recharge_first')]); // 请先充值后再查看任务
|
|
|
+
|
|
|
}
|
|
|
|
|
|
// 获取用户任务数据
|
|
|
@@ -585,8 +589,10 @@ class ActivityController extends Controller
|
|
|
'type' => $taskCfg['type'],
|
|
|
'completed' => $completed,
|
|
|
'status' => $completed ? 1 : 0,
|
|
|
- 'status_text' => $completed ? '已完成' : '未完成',
|
|
|
- 'progress' => min($taskData[$progressKey] ?? 0,$taskCfg['target']),
|
|
|
+// 'status_text' => $completed ? '已完成' : '未完成',
|
|
|
+ 'status_text' => $completed ? __('messages.web.vip_task.completed') : __('messages.web.vip_task.not_completed'), // 已完成 : 未完成
|
|
|
+
|
|
|
+ 'progress' => intval(min($taskData[$progressKey] ?? 0,$taskCfg['target'])),
|
|
|
'target' => $taskCfg['target']
|
|
|
];
|
|
|
}
|
|
|
@@ -595,22 +601,30 @@ class ActivityController extends Controller
|
|
|
$tasks = [
|
|
|
'stage1' => [
|
|
|
'stage' => 1,
|
|
|
- 'title' => '阶段任务1',
|
|
|
+// 'title' => '阶段任务1',
|
|
|
+ 'title' => __('messages.web.vip_task.stage1_title'), // 阶段任务1
|
|
|
+
|
|
|
'reward' => $taskConfig['stage1']['reward'],
|
|
|
'completed' => $taskData['stage1_completed'],
|
|
|
'reward_status' => $stage1_reward_status,
|
|
|
- 'reward_status_text' => ['不能领取', '待领取', '已领取'][$stage1_reward_status],
|
|
|
+// 'reward_status_text' => ['不能领取', '待领取', '已领取'][$stage1_reward_status],
|
|
|
+ 'reward_status_text' => [__('messages.web.vip_task.cannot_claim'), __('messages.web.vip_task.can_claim'), __('messages.web.vip_task.claimed')][$stage1_reward_status], // 不能领取, 待领取, 已领取
|
|
|
+
|
|
|
'can_claim' => $stage1_reward_status === 1,
|
|
|
'tasks' => $stage1Tasks
|
|
|
],
|
|
|
'stage2' => [
|
|
|
'stage' => 2,
|
|
|
- 'title' => '阶段任务2',
|
|
|
+// 'title' => '阶段任务2',
|
|
|
+ 'title' => __('messages.web.vip_task.stage2_title'), // 阶段任务2
|
|
|
+
|
|
|
'reward' => $taskConfig['stage2']['reward'],
|
|
|
'unlocked' => $taskData['stage1_completed'],
|
|
|
'completed' => $taskData['stage2_completed'],
|
|
|
'reward_status' => $stage2_reward_status,
|
|
|
- 'reward_status_text' => ['不能领取', '待领取', '已领取'][$stage2_reward_status],
|
|
|
+// 'reward_status_text' => ['不能领取', '待领取', '已领取'][$stage2_reward_status],
|
|
|
+ 'reward_status_text' => [__('messages.web.vip_task.cannot_claim'), __('messages.web.vip_task.can_claim'), __('messages.web.vip_task.claimed')][$stage2_reward_status], // 不能领取, 待领取, 已领取
|
|
|
+
|
|
|
'can_claim' => $stage2_reward_status === 1,
|
|
|
'tasks' => array_map(function($taskCfg) use ($taskData) {
|
|
|
$taskKey = $taskCfg['id'];
|
|
|
@@ -623,15 +637,18 @@ class ActivityController extends Controller
|
|
|
'type' => $taskCfg['type'],
|
|
|
'completed' => $completed,
|
|
|
'status' => $completed ? 1 : 0,
|
|
|
- 'status_text' => $completed ? '已完成' : '未完成',
|
|
|
- 'progress' => min($taskData[$progressKey] ?? 0,$taskCfg['target']),
|
|
|
+// 'status_text' => $completed ? '已完成' : '未完成',
|
|
|
+ 'status_text' => $completed ? __('messages.web.vip_task.completed') : __('messages.web.vip_task.not_completed'), // 已完成 : 未完成
|
|
|
+ 'progress' => intval(min($taskData[$progressKey] ?? 0,$taskCfg['target'])),
|
|
|
'target' => $taskCfg['target']
|
|
|
];
|
|
|
}, $taskConfig['stage2']['tasks'])
|
|
|
],
|
|
|
'stage3' => [
|
|
|
'stage' => 3,
|
|
|
- 'title' => '阶段任务3(循环任务)',
|
|
|
+// 'title' => '阶段任务3(循环任务)',
|
|
|
+ 'title' => __('messages.web.vip_task.stage3_title'), // 阶段任务3(循环任务)
|
|
|
+
|
|
|
'unlocked' => $taskData['stage2_completed'],
|
|
|
'is_loop' => true,
|
|
|
'current_loop' => $taskData['stage3_loop_count'],
|
|
|
@@ -648,9 +665,11 @@ class ActivityController extends Controller
|
|
|
'reward' => $taskCfg['reward'],
|
|
|
'completed' => $completed,
|
|
|
'reward_status' => $rewardStatus,
|
|
|
- 'reward_status_text' => ['不能领取', '待领取', '可重复领取'][$rewardStatus],
|
|
|
+// 'reward_status_text' => ['不能领取', '待领取', '可重复领取'][$rewardStatus],
|
|
|
+ 'reward_status_text' => [__('messages.web.vip_task.cannot_claim'), __('messages.web.vip_task.can_claim'), __('messages.web.vip_task.repeatable')][$rewardStatus], // 不能领取, 待领取, 可重复领取
|
|
|
+
|
|
|
'can_claim' => $rewardStatus === 1,
|
|
|
- 'progress' => min($taskData[$progressKey] ?? 0,$taskCfg['target']),
|
|
|
+ 'progress' => intval(min($taskData[$progressKey] ?? 0,$taskCfg['target'])),
|
|
|
'target' => $taskCfg['target']
|
|
|
];
|
|
|
}, $taskConfig['stage3']['tasks'])
|
|
|
@@ -672,7 +691,9 @@ class ActivityController extends Controller
|
|
|
|
|
|
$redisLockKey = "vip_withdraw_claim_{$userId}";
|
|
|
if (!Redis::set($redisLockKey, 1, 'EX', 10, 'NX')) {
|
|
|
- return apiReturnFail('操作太频繁,请稍后再试');
|
|
|
+// return apiReturnFail('操作太频繁,请稍后再试');
|
|
|
+ return apiReturnFail(['web.vip_task.operation_frequent', __('messages.web.vip_task.operation_frequent')]); //'操作太频繁,请稍后再试'
|
|
|
+
|
|
|
}
|
|
|
|
|
|
try {
|
|
|
@@ -684,11 +705,15 @@ class ActivityController extends Controller
|
|
|
if ($stage === 1) {
|
|
|
if (!$taskData['stage1_completed']) {
|
|
|
Redis::del($redisLockKey);
|
|
|
- return apiReturnFail('任务未完成');
|
|
|
+// return apiReturnFail('任务未完成');
|
|
|
+ return apiReturnFail(['web.vip_task.task_not_completed', __('messages.web.vip_task.task_not_completed')]); // 任务未完成
|
|
|
+
|
|
|
}
|
|
|
if ($taskData['stage1_withdrawn']) {
|
|
|
Redis::del($redisLockKey);
|
|
|
- return apiReturnFail('奖励已领取');
|
|
|
+ return apiReturnFail(['web.vip_task.reward_claimed', __('messages.web.vip_task.reward_claimed')]); // 奖励已领取
|
|
|
+
|
|
|
+// return apiReturnFail('奖励已领取');
|
|
|
}
|
|
|
$rewardAmount = 10;
|
|
|
$this->updateTaskProgress($userId, 'stage1_withdrawn', 1);
|
|
|
@@ -697,11 +722,15 @@ class ActivityController extends Controller
|
|
|
elseif ($stage === 2) {
|
|
|
if (!$taskData['stage2_completed']) {
|
|
|
Redis::del($redisLockKey);
|
|
|
- return apiReturnFail('任务未完成');
|
|
|
+// return apiReturnFail('任务未完成');
|
|
|
+ return apiReturnFail(['web.vip_task.task_not_completed', __('messages.web.vip_task.task_not_completed')]); // 任务未完成
|
|
|
+
|
|
|
}
|
|
|
if ($taskData['stage2_withdrawn']) {
|
|
|
Redis::del($redisLockKey);
|
|
|
- return apiReturnFail('奖励已领取');
|
|
|
+ return apiReturnFail(['web.vip_task.reward_claimed', __('messages.web.vip_task.reward_claimed')]); // 奖励已领取
|
|
|
+
|
|
|
+// return apiReturnFail('奖励已领取');
|
|
|
}
|
|
|
$rewardAmount = 10;
|
|
|
$this->updateTaskProgress($userId, 'stage2_withdrawn', 1);
|
|
|
@@ -721,14 +750,18 @@ class ActivityController extends Controller
|
|
|
// 每满1200可领取40,领取后扣除1200下注进度
|
|
|
if (($taskData['stage3_current_bet'] ?? 0) < 12000) {
|
|
|
Redis::del($redisLockKey);
|
|
|
- return apiReturnFail('任务未完成');
|
|
|
+ return apiReturnFail(['web.vip_task.task_not_completed', __('messages.web.vip_task.task_not_completed')]); // 任务未完成
|
|
|
+
|
|
|
+// return apiReturnFail('任务未完成');
|
|
|
}
|
|
|
$rewardAmount = 40;
|
|
|
$this->updateTaskProgress($userId, 'stage3_current_bet', max(0, ($taskData['stage3_current_bet'] - 12000)));
|
|
|
}
|
|
|
} else {
|
|
|
Redis::del($redisLockKey);
|
|
|
- return apiReturnFail('无效的阶段');
|
|
|
+ return apiReturnFail(['web.vip_task.invalid_stage', __('messages.web.vip_task.invalid_stage')]); // 无效的阶段
|
|
|
+
|
|
|
+// return apiReturnFail('无效的阶段');
|
|
|
}
|
|
|
|
|
|
// 添加提现额度到用户账户
|
|
|
@@ -793,7 +826,9 @@ class ActivityController extends Controller
|
|
|
Redis::del($redisLockKey);
|
|
|
return apiReturnSuc([
|
|
|
'amount' => $rewardAmount,
|
|
|
- 'message' => "成功领取 {$rewardAmount} 提现额度"
|
|
|
+// 'message' => "成功领取 {$rewardAmount} 提现额度"
|
|
|
+ 'message' => __('messages.web.vip_task.claim_success', ['amount' => $rewardAmount]) // "成功领取 {$rewardAmount} 提现额度"
|
|
|
+
|
|
|
]);
|
|
|
|
|
|
} catch (\Exception $e) {
|
|
|
@@ -802,7 +837,9 @@ class ActivityController extends Controller
|
|
|
'user_id' => $userId,
|
|
|
'error' => $e->getMessage()
|
|
|
]);
|
|
|
- return apiReturnFail('领取失败:' . $e->getMessage());
|
|
|
+ return apiReturnFail(['web.vip_task.claim_failed', __('messages.web.vip_task.claim_failed', ['error' => $e->getMessage()])]); // 领取失败:
|
|
|
+
|
|
|
+// return apiReturnFail('领取失败:' . $e->getMessage());
|
|
|
}
|
|
|
}
|
|
|
|