yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-12-16 18:32:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: order service

Browse Source
This commit is contained in:
tokumeikoi
2022-03-04 22:48:44 +08:00
parent b85eb72d1a
commit d0cab99ae4
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Services/OrderService.php
View File

@@ -117,7 +117,7 @@ class OrderService
public function setInvite(User $user):void public function setInvite(User $user):void
{ {
$order = $this->order; $order = $this->order;
if ($user->invite_user_id && $order->total_amount > 0) { if ($user->invite_user_id && ($order->total_amount <= 0)) return;
$order->invite_user_id = $user->invite_user_id; $order->invite_user_id = $user->invite_user_id;
$inviter = User::find($user->invite_user_id); $inviter = User::find($user->invite_user_id);
$isCommission = false; $isCommission = false;
@@ -134,15 +134,13 @@ class OrderService
break; break;
} }
if ($isCommission) { if ($isCommission) return;
if ($inviter && $inviter->commission_rate) { if ($inviter && $inviter->commission_rate) {
$order->commission_balance = $order->total_amount * ($inviter->commission_rate / 100); $order->commission_balance = $order->total_amount * ($inviter->commission_rate / 100);
} else { } else {
$order->commission_balance = $order->total_amount * (config('v2board.invite_commission', 10) / 100); $order->commission_balance = $order->total_amount * (config('v2board.invite_commission', 10) / 100);
} }
} }
}
}
private function haveValidOrder(User $user) private function haveValidOrder(User $user)
{ {

2
public/theme/v2board/assets/umi.js vendored
View File

File diff suppressed because one or more lines are too long