feat: 商城付费购买流 + 市场契约

- MarketPackage 模型/迁移:市场商品作为可购买实体(payable),复用 Payment 订单
- MarketPurchaseService:购买创建订单、已购判断、免费/付费门槛校验
- payment.paid 监听(核心注册,仅支付插件启用时)标记商品已购
- 市场契约:条目含 name/type/price(分)/download_url;插件市场 Tab 只显示 plugin、主题市场 Tab 只显示 theme;付费商品显示「购买」按钮与「已购买」徽章,未购买无法安装
- 新增主题市场 Tab(原仅插件页有市场)
- 测试:购买/沙箱支付标记已购/重复购买/安装门槛/免费条目/支付插件禁用
This commit is contained in:
ak
2026-08-12 01:34:04 +08:00
parent 4d63c0c683
commit e06e7c4300
11 changed files with 551 additions and 7 deletions
+114
View File
@@ -0,0 +1,114 @@
<?php
declare(strict_types=1);
namespace App\Blog\Services;
use App\Blog\Support\PluginManager;
use App\Models\MarketPackage;
use Plugins\Neatstudio\Payment\Models\Payment;
use Plugins\Neatstudio\Payment\Services\PaymentManager;
use RuntimeException;
class MarketPurchaseService
{
public function __construct(private PluginManager $plugins, private PaymentManager $payment)
{
}
/**
* 市场条目键:优先 item.name,缺省用下载文件名。
*/
public function itemKey(array $item): string
{
$name = $item['name'] ?? null;
if ($name) {
return (string) $name;
}
return basename((string) ($item['download_url'] ?? ''), '.zip') ?: uniqid('item-');
}
public function itemType(array $item): string
{
return $item['type'] ?? 'plugin';
}
public function requiresPayment(array $item): bool
{
return (int) ($item['price'] ?? 0) > 0;
}
/**
* 购买市场商品:创建订单并返回(null = 已购买过,无需重复支付)。
*/
public function purchase(array $item): ?Payment
{
if (! $this->plugins->isEnabled('neatstudio.payment')) {
throw new RuntimeException('付费市场商品需要启用支付插件');
}
$price = (int) ($item['price'] ?? 0);
if ($price <= 0) {
throw new RuntimeException('该商品免费,无需购买');
}
$key = $this->itemKey($item);
$type = $this->itemType($item);
$user = auth()->user();
$package = MarketPackage::query()->firstOrCreate(
['item_key' => $key, 'item_type' => $type],
[
'title' => (string) ($item['title'] ?? $key),
'price' => $price,
'status' => 'pending',
'user_id' => $user?->id,
]
);
if ($package->isPaid()) {
return null;
}
return $this->payment->createOrder(
$user ?? $this->systemUser(),
'购买商品:'.$package->title,
$price,
$package,
'alipay'
);
}
public function isPurchased(string $key, string $type = 'plugin'): bool
{
return MarketPackage::query()
->where('item_key', $key)
->where('item_type', $type)
->where('status', 'paid')
->exists();
}
/**
* 校验市场条目可否安装:免费直接装,付费需已购买。
*/
public function assertCanInstall(array $item): void
{
if ($this->requiresPayment($item) && ! $this->isPurchased($this->itemKey($item), $this->itemType($item))) {
throw new RuntimeException('该商品为付费商品,请先购买后再安装');
}
}
private function systemUser(): \App\Models\User
{
$user = \App\Models\User::query()->first();
if (! $user) {
throw new RuntimeException('无可用用户创建订单,请先登录');
}
return $user;
}
}
+10 -1
View File
@@ -29,7 +29,16 @@ class MarketplaceClient
$response->throw();
return $response->json('items', []);
$items = $response->json('items', []);
// 规范化市场契约:price 分、typeplugin/theme)、name
return array_map(function (array $item) {
$item['price'] = (int) ($item['price'] ?? 0);
$item['type'] = $item['type'] ?? 'plugin';
$item['name'] = $item['name'] ?? null;
return $item;
}, is_array($items) ? $items : []);
}
public function download(string $url): string
+47 -2
View File
@@ -6,6 +6,7 @@ declare(strict_types=1);
namespace App\Filament\Pages;
use App\Blog\Services\MarketplaceClient;
use App\Blog\Services\MarketPurchaseService;
use App\Blog\Services\PackageInstaller;
use App\Blog\Support\PluginManager;
use Filament\Notifications\Notification;
@@ -88,8 +89,12 @@ class Plugins extends Page
public function loadMarket(): void
{
try {
$this->marketItems = app(MarketplaceClient::class)->items();
Notification::make()->title('市场已刷新:'.count($this->marketItems).' 个包')->success()->send();
$items = app(MarketplaceClient::class)->items();
$this->marketItems = array_values(array_filter(
$items,
fn (array $item) => ($item['type'] ?? 'plugin') === 'plugin'
));
Notification::make()->title('市场已刷新:'.count($this->marketItems).' 个插件')->success()->send();
} catch (\Throwable $e) {
Notification::make()->title('市场加载失败')->body($e->getMessage())->danger()->send();
}
@@ -104,6 +109,9 @@ class Plugins extends Page
}
try {
// 付费商品需先购买
app(MarketPurchaseService::class)->assertCanInstall($item);
$result = app(PackageInstaller::class)->installFromMarket($item);
Notification::make()->title('安装成功:'.$result['key'])->success()->send();
} catch (\Throwable $e) {
@@ -111,6 +119,43 @@ class Plugins extends Page
}
}
public function purchaseMarketItem(string $index)
{
$item = $this->marketItems[(int) $index] ?? null;
if (! $item) {
return;
}
try {
$payment = app(MarketPurchaseService::class)->purchase($item);
if (! $payment) {
Notification::make()->title('该商品已购买')->info()->send();
return;
}
return redirect()->route('pay.checkout', $payment);
} catch (\Throwable $e) {
Notification::make()->title('购买失败')->body($e->getMessage())->danger()->send();
}
}
public function isMarketPurchased(string $index): bool
{
$item = $this->marketItems[(int) $index] ?? null;
if (! $item) {
return false;
}
return app(MarketPurchaseService::class)->isPurchased(
app(MarketPurchaseService::class)->itemKey($item),
app(MarketPurchaseService::class)->itemType($item)
);
}
public function getMarketConfiguredProperty(): bool
{
return (bool) config('market.url');
+78
View File
@@ -5,6 +5,8 @@ declare(strict_types=1);
namespace App\Filament\Pages;
use App\Blog\Services\MarketplaceClient;
use App\Blog\Services\MarketPurchaseService;
use App\Blog\Services\PackageInstaller;
use App\Blog\Support\ThemeManager;
use Filament\Notifications\Notification;
@@ -27,6 +29,8 @@ class Themes extends Page
public $zip;
public array $marketItems = [];
public function getThemesProperty(): array
{
return app(ThemeManager::class)->all();
@@ -67,4 +71,78 @@ class Themes extends Page
Notification::make()->title('删除失败')->body($e->getMessage())->danger()->send();
}
}
public function loadThemeMarket(): void
{
try {
$items = app(MarketplaceClient::class)->items();
$this->marketItems = array_values(array_filter(
$items,
fn (array $item) => ($item['type'] ?? 'plugin') === 'theme'
));
Notification::make()->title('市场已刷新:'.count($this->marketItems).' 个主题')->success()->send();
} catch (\Throwable $e) {
Notification::make()->title('市场加载失败')->body($e->getMessage())->danger()->send();
}
}
public function installFromThemeMarket(string $index): void
{
$item = $this->marketItems[(int) $index] ?? null;
if (! $item) {
return;
}
try {
app(MarketPurchaseService::class)->assertCanInstall($item);
$result = app(PackageInstaller::class)->installFromMarket($item);
Notification::make()->title('主题安装成功:'.$result['key'])->success()->send();
} catch (\Throwable $e) {
Notification::make()->title('安装失败')->body($e->getMessage())->danger()->send();
}
}
public function purchaseThemeMarketItem(string $index)
{
$item = $this->marketItems[(int) $index] ?? null;
if (! $item) {
return;
}
try {
$payment = app(MarketPurchaseService::class)->purchase($item);
if (! $payment) {
Notification::make()->title('该商品已购买')->info()->send();
return;
}
return redirect()->route('pay.checkout', $payment);
} catch (\Throwable $e) {
Notification::make()->title('购买失败')->body($e->getMessage())->danger()->send();
}
}
public function isThemeMarketPurchased(string $index): bool
{
$item = $this->marketItems[(int) $index] ?? null;
if (! $item) {
return false;
}
return app(MarketPurchaseService::class)->isPurchased(
app(MarketPurchaseService::class)->itemKey($item),
app(MarketPurchaseService::class)->itemType($item)
);
}
public function getMarketConfiguredProperty(): bool
{
return (bool) config('market.url');
}
}
+47
View File
@@ -0,0 +1,47 @@
<?php
declare(strict_types=1);
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Plugins\Neatstudio\Payment\Models\Payment;
class MarketPackage extends Model
{
protected $fillable = [
'item_key', 'item_type', 'title', 'price', 'status', 'payment_id', 'user_id',
];
public function payment(): BelongsTo
{
return $this->belongsTo(Payment::class);
}
public function isPaid(): bool
{
return $this->status === 'paid';
}
public function markPaid(Payment $payment): void
{
$this->update([
'status' => 'paid',
'payment_id' => $payment->id,
]);
}
/**
* 作为可购买实体(市场商品)的展示约定。
*/
public function payableLabel(): string
{
return '市场商品:'.$this->title;
}
public function payableUrl(): ?string
{
return null;
}
}
+20
View File
@@ -19,6 +19,23 @@ class AppServiceProvider extends ServiceProvider
//
}
private function registerMarketPurchaseListener(): void
{
$manager = app(\App\Blog\Support\PluginManager::class);
if (! $manager->isEnabled('neatstudio.payment')) {
return;
}
$manager->addAction('payment.paid', function (\Plugins\Neatstudio\Payment\Models\Payment $payment) {
$payable = $payment->payable;
if ($payable instanceof \App\Models\MarketPackage) {
$payable->markPaid($payment);
}
}, 10);
}
/**
* Bootstrap any application services.
*/
@@ -29,6 +46,9 @@ class AppServiceProvider extends ServiceProvider
$this->loadMigrationsFrom($path);
}
// 商城付费:支付成功标记市场商品已购(仅当支付插件启用时注册)
$this->registerMarketPurchaseListener();
// 前台页面缓存(匿名 GET,缓存含 SEO 注入后的最终 HTML)
app('router')->pushMiddlewareToGroup('web', \App\Blog\Support\PageCacheMiddleware::class);