update trojan server

This commit is contained in:
Tokumeikoi 2020-06-12 00:40:37 +08:00
parent 0e4d5c9e99
commit da98dcad9c
2 changed files with 3 additions and 1 deletions

View File

@ -133,6 +133,7 @@ class OrderService
$orderSurplusMonth = $orderSurplusMonth + $strToMonth[$item->cycle]; $orderSurplusMonth = $orderSurplusMonth + $strToMonth[$item->cycle];
$orderSurplusAmount = $orderSurplusAmount + ($item['total_amount'] + $item['balance_amount']); $orderSurplusAmount = $orderSurplusAmount + ($item['total_amount'] + $item['balance_amount']);
} }
if (!$orderSurplusMonth || !$orderSurplusAmount) return;
$monthUnitPrice = $orderSurplusAmount / $orderSurplusMonth; $monthUnitPrice = $orderSurplusAmount / $orderSurplusMonth;
// 如果用户过期月大于订单过期月 // 如果用户过期月大于订单过期月
if ($userSurplusMonth > $orderSurplusMonth) { if ($userSurplusMonth > $orderSurplusMonth) {

View File

@ -3,6 +3,7 @@
namespace App\Utils; namespace App\Utils;
use App\Models\Server; use App\Models\Server;
use App\Models\ServerTrojan;
use App\Models\User; use App\Models\User;
class Helper class Helper
@ -56,7 +57,7 @@ class Helper
return $str; return $str;
} }
public static function buildTrojanLink(Server $server, User $user) public static function buildTrojanLink(ServerTrojan $server, User $user)
{ {
$uri = "trojan://{$user->uuid}@{$server->host}:{$server->port}"; $uri = "trojan://{$user->uuid}@{$server->host}:{$server->port}";
$uri .= "\r\n"; $uri .= "\r\n";