lkddi/Xboard
1
0
Fork 0
mirror of https://github.com/lkddi/Xboard.git synced 2026-04-05 12:40:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add tags to plans, refactor order service, adn fix ticket lock

Browse Source
This commit is contained in:
xboard
2025-07-01 11:14:18 +08:00
parent 349c1710fe
commit 05afe870e7
13 changed files with 208 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/Http/Controllers/V1/User/OrderController.php
View File

@@ -43,7 +43,7 @@ class OrderController extends Controller
$request->validate([
'trade_no' => 'required|string',
]);
$order = Order::with(['payment','plan'])
$order = Order::with(['payment', 'plan'])
->where('user_id', $request->user()->id)
->where('trade_no', $request->input('trade_no'))
->first();
@@ -77,45 +77,16 @@ class OrderController extends Controller
$plan = Plan::findOrFail($request->input('plan_id'));
$planService = new PlanService($plan);
// Validate plan purchase
$planService->validatePurchase($user, $request->input('period'));
return DB::transaction(function () use ($request, $plan, $user, $userService) {
$period = $request->input('period');
$newPeriod = PlanService::getPeriodKey($period);
$order = OrderService::createFromRequest(
$user,
$plan,
$request->input('period'),
$request->input('coupon_code')
);
// Create order
$order = new Order([
'user_id' => $user->id,
'plan_id' => $plan->id,
'period' => $newPeriod,
'trade_no' => Helper::generateOrderNo(),
'total_amount' => optional($plan->prices)[$newPeriod] * 100
]);
// Apply coupon if provided
if ($request->input('coupon_code')) {
$this->applyCoupon($order, $request->input('coupon_code'));
}
// Set order attributes
$orderService = new OrderService($order);
$orderService->setVipDiscount($user);
$orderService->setOrderType($user);
$orderService->setInvite($user);
// Handle user balance
if ($user->balance && $order->total_amount > 0) {
$this->handleUserBalance($order, $user, $userService);
}
if (!$order->save()) {
throw new ApiException(__('Failed to create order'));
}
HookManager::call('order.after_create', $order);
return $this->success($order->trade_no);
});
return $this->success($order->trade_no);
}
protected function applyCoupon(Order $order, string $couponCode): void

5
app/Http/Controllers/V1/User/TicketController.php
View File

@@ -43,8 +43,9 @@ class TicketController extends Controller
{
try{
DB::beginTransaction();
if ((int)Ticket::where('status', 0)->where('user_id', $request->user()->id)->lockForUpdate()->count()) {
throw new \Exception(__('There are other unresolved tickets'));
if (Ticket::where('status', 0)->where('user_id', $request->user()->id)->lockForUpdate()->first()) {
DB::rollBack();
return $this->fail([400, '存在未关闭的工单']);
}
$ticket = Ticket::create(array_merge($request->only([
'subject',