简化婚礼流程:去掉立即/定时选择,同意结婚后直接立即举办婚礼

This commit is contained in:
2026-03-01 19:11:29 +08:00
parent e9a41995be
commit eefdae93fe
2 changed files with 13 additions and 60 deletions

View File

@@ -19,7 +19,6 @@ use App\Models\WeddingCeremony;
use App\Services\WeddingService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Carbon;
class WeddingController extends Controller
{
@@ -60,28 +59,24 @@ class WeddingController extends Controller
}
$data = $request->validate([
'tier_id' => 'nullable|integer|exists:wedding_tiers,id',
'tier_id' => 'required|integer|exists:wedding_tiers,id',
'payer_type' => 'required|in:groom,joint',
'ceremony_type' => 'required|in:immediate,scheduled',
'ceremony_at' => 'nullable|date|after:now',
]);
$ceremonyAt = isset($data['ceremony_at']) ? Carbon::parse($data['ceremony_at']) : null;
// 固定立即举办,不再接受 scheduled 选项
$result = $this->wedding->setup(
$marriage,
$data['tier_id'] ?? null,
$data['tier_id'],
$data['payer_type'],
$data['ceremony_type'],
$ceremonyAt,
'immediate',
null,
);
// 立即婚礼:直接触发
if ($result['ok'] && $data['ceremony_type'] === 'immediate') {
// 立即触发婚礼庆典并广播
if ($result['ok']) {
$ceremony = WeddingCeremony::find($result['ceremony_id']);
if ($ceremony) {
$triggerResult = $this->wedding->trigger($ceremony);
// 广播全房间婚礼事件
$this->wedding->trigger($ceremony);
broadcast(new WeddingCelebration($ceremony, $marriage));
}
}