From 77ac3c58fa5f5eafdcace5ac2be218bf6bc418a1 Mon Sep 17 00:00:00 2001 From: qiuxiang <394405259@qq.com> Date: Wed, 30 Sep 2026 17:12:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=81=9A=E6=B0=B4=E6=BD=AD=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=A0=87=E7=AD=BE=E6=98=8E=E7=BB=86=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=94=B9=E4=B8=BA=E7=BC=93=E5=AD=98=E5=B9=B6?= =?UTF-8?q?=E9=A2=84=E7=83=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 233 万行上做 distinct 扫描要几秒;新增 JstOrderLabelOptions(按公司缓存 24 小时),页面读取缓存,导入命令结束时失效并预热,避免每次打开页面都等待。 --- app/Business/JstOrderLabelImporter.php | 4 ++ app/Business/JstOrderLabelOptions.php | 72 +++++++++++++++++++++++++ app/Http/Controllers/Business/Pages.php | 18 +------ 3 files changed, 78 insertions(+), 16 deletions(-) create mode 100644 app/Business/JstOrderLabelOptions.php diff --git a/app/Business/JstOrderLabelImporter.php b/app/Business/JstOrderLabelImporter.php index 7d5471a8..7f4f5381 100644 --- a/app/Business/JstOrderLabelImporter.php +++ b/app/Business/JstOrderLabelImporter.php @@ -112,6 +112,10 @@ class JstOrderLabelImporter ->distinct() ->count('label'); + // 导入会改变筛选选项,重新预热缓存,避免页面下次打开时做几秒的 distinct 扫描。 + app(JstOrderLabelOptions::class)->forget($companyId); + app(JstOrderLabelOptions::class)->warm($companyId); + return [ 'from' => $from, 'to' => $to, diff --git a/app/Business/JstOrderLabelOptions.php b/app/Business/JstOrderLabelOptions.php new file mode 100644 index 00000000..18dbbfea --- /dev/null +++ b/app/Business/JstOrderLabelOptions.php @@ -0,0 +1,72 @@ + */ + public function labels(int $companyId): array + { + return $this->remember($companyId, 'label'); + } + + /** @return list */ + public function shops(int $companyId): array + { + return $this->remember($companyId, 'shop_name'); + } + + public function warm(int $companyId): void + { + $this->labels($companyId); + $this->shops($companyId); + } + + public function forget(int $companyId): void + { + Cache::forget($this->key($companyId, 'label')); + Cache::forget($this->key($companyId, 'shop_name')); + } + + /** @return list */ + private function remember(int $companyId, string $column): array + { + $key = $this->key($companyId, $column); + $cached = Cache::get($key); + if (is_array($cached)) { + return $cached; + } + + $values = JstOrderLabel::query() + ->where('company_id', $companyId) + ->whereNotNull($column) + ->where($column, '<>', '') + ->distinct() + ->orderBy($column) + ->limit(self::LIMIT) + ->pluck($column) + ->all(); + + Cache::put($key, $values, now()->addHours(self::TTL_HOURS)); + + return $values; + } + + private function key(int $companyId, string $column): string + { + return "jst-order-labels:options:v1:{$companyId}:{$column}"; + } +} diff --git a/app/Http/Controllers/Business/Pages.php b/app/Http/Controllers/Business/Pages.php index be7ea85c..d5d08aa1 100644 --- a/app/Http/Controllers/Business/Pages.php +++ b/app/Http/Controllers/Business/Pages.php @@ -1336,8 +1336,8 @@ class Pages extends Controller 'filters' => $filters, 'totalRows' => $records->total(), 'filterOptions' => [ - 'shops' => $this->jstOrderLabelOptions('shop_name', 500), - 'labels' => $this->jstOrderLabelOptions('label', 500), + 'shops' => app(\App\Business\JstOrderLabelOptions::class)->shops((int) company_id()), + 'labels' => app(\App\Business\JstOrderLabelOptions::class)->labels((int) company_id()), ], ]; } @@ -1378,20 +1378,6 @@ class Pages extends Controller return $query; } - /** @return list */ - private function jstOrderLabelOptions(string $column, int $limit): array - { - return \App\Models\Business\JstOrderLabel::query() - ->where('company_id', company_id()) - ->whereNotNull($column) - ->where($column, '<>', '') - ->distinct() - ->orderBy($column) - ->limit($limit) - ->pluck($column) - ->all(); - } - /** 账单流水数据 › 聚水潭订单标签明细导出(按当前筛选,全量) */ public function exportJstOrderLabels(Request $request): StreamedResponse { From b2647fa26d668b2e997a58c31a7d0ec74c31790e Mon Sep 17 00:00:00 2001 From: qiuxiang <394405259@qq.com> Date: Wed, 30 Sep 2026 17:44:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=8D=E8=8F=9C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B1=87=E6=80=BB=E4=B8=80=E7=BA=A7=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E5=B9=B6=E6=8A=8A=E4=B8=A4=E4=B8=AA=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E9=A1=B5=E7=A7=BB=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 账单流水数据下移出「种菜明细表」「聚水潭订单标签明细」,新增并列一级菜单「种菜数据汇总」(图标 grass)承载这两个页面;导出路由改到 workspace/planting-data/... 并同步路由名、页面中间件与导出链接;更新导航/页面用例(账单流水数据页签列表恢复原样)。 --- config/business_navigation.php | 12 ++++++++++-- .../billing-transactions/jst-order-labels.blade.php | 2 +- .../billing-transactions/planting-details.blade.php | 2 +- routes/admin.php | 12 ++++++------ tests/Feature/Business/JstOrderLabelsPageTest.php | 6 +++--- .../Business/MarketingAccountBillsTabsTest.php | 6 ++++++ tests/Feature/Business/PlantingDetailsPageTest.php | 6 +++--- tests/Feature/Settings/NavigationTest.php | 6 ++++-- 8 files changed, 34 insertions(+), 18 deletions(-) diff --git a/config/business_navigation.php b/config/business_navigation.php index 3015693c..08b4df13 100644 --- a/config/business_navigation.php +++ b/config/business_navigation.php @@ -426,8 +426,6 @@ $navigation = [ 'icon' => 'receipt_long', 'pages' => [ ['slug' => 'bank-transactions', 'title' => '银行账户流水'], - ['slug' => 'planting-details', 'title' => '种菜明细表'], - ['slug' => 'jst-order-labels', 'title' => '聚水潭订单标签明细'], [ 'slug' => 'store-receiving-bills', 'title' => '店铺收款账户账单', @@ -473,6 +471,15 @@ $navigation = [ ], ], ], + [ + 'slug' => 'planting-data', + 'title' => '种菜数据汇总', + 'icon' => 'grass', + 'pages' => [ + ['slug' => 'planting-details', 'title' => '种菜明细表'], + ['slug' => 'jst-order-labels', 'title' => '聚水潭订单标签明细'], + ], + ], [ 'slug' => 'account-balance-data', 'title' => '账单余额数据', @@ -839,6 +846,7 @@ $requestedSectionOrder = [ 'order-data', 'refunds', 'billing-transactions', + 'planting-data', 'account-balance-data', 'product-inventory', ]; diff --git a/resources/views/business/pages/billing-transactions/jst-order-labels.blade.php b/resources/views/business/pages/billing-transactions/jst-order-labels.blade.php index 0e980b26..77a6e5b1 100644 --- a/resources/views/business/pages/billing-transactions/jst-order-labels.blade.php +++ b/resources/views/business/pages/billing-transactions/jst-order-labels.blade.php @@ -106,7 +106,7 @@ 重置 - + 导出 diff --git a/resources/views/business/pages/billing-transactions/planting-details.blade.php b/resources/views/business/pages/billing-transactions/planting-details.blade.php index 50e9c2eb..84cae8ec 100644 --- a/resources/views/business/pages/billing-transactions/planting-details.blade.php +++ b/resources/views/business/pages/billing-transactions/planting-details.blade.php @@ -189,7 +189,7 @@ 重置 - + 导出 diff --git a/routes/admin.php b/routes/admin.php index 042f6085..82ad242f 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -172,13 +172,13 @@ Route::get('workspace/product-inventory/monthly-weighted-average-price/export', ->middleware('business.page:product-inventory,monthly-weighted-average-price') ->name('business.product-inventory.monthly-weighted-average-price.export'); -Route::get('workspace/billing-transactions/planting-details/export', 'Business\Pages@exportPlantingDetails') - ->middleware('business.page:billing-transactions,planting-details') - ->name('business.billing-transactions.planting-details.export'); +Route::get('workspace/planting-data/planting-details/export', 'Business\Pages@exportPlantingDetails') + ->middleware('business.page:planting-data,planting-details') + ->name('business.planting-data.planting-details.export'); -Route::get('workspace/billing-transactions/jst-order-labels/export', 'Business\Pages@exportJstOrderLabels') - ->middleware('business.page:billing-transactions,jst-order-labels') - ->name('business.billing-transactions.jst-order-labels.export'); +Route::get('workspace/planting-data/jst-order-labels/export', 'Business\Pages@exportJstOrderLabels') + ->middleware('business.page:planting-data,jst-order-labels') + ->name('business.planting-data.jst-order-labels.export'); Route::prefix('workspace/product-inventory/inventory-report/warehouse-mappings') ->middleware('business.page:product-inventory,inventory-report') diff --git a/tests/Feature/Business/JstOrderLabelsPageTest.php b/tests/Feature/Business/JstOrderLabelsPageTest.php index b7cbe00e..5001dcd6 100644 --- a/tests/Feature/Business/JstOrderLabelsPageTest.php +++ b/tests/Feature/Business/JstOrderLabelsPageTest.php @@ -76,7 +76,7 @@ class JstOrderLabelsPageTest extends FeatureTestCase app(JstOrderLabelImporter::class)->import('2026-09-01', '2026-09-15', $this->company->id, true); $page = $this->loginAs()->get(route('business.pages.show', [ - 'section' => 'billing-transactions', + 'section' => 'planting-data', 'page' => 'jst-order-labels', ])); @@ -89,7 +89,7 @@ class JstOrderLabelsPageTest extends FeatureTestCase ->assertSee('data-jst-labels-clear="jst-label-date-to"', false); $filtered = $this->loginAs()->get(route('business.pages.show', [ - 'section' => 'billing-transactions', + 'section' => 'planting-data', 'page' => 'jst-order-labels', 'label' => '京喜', ])); @@ -97,7 +97,7 @@ class JstOrderLabelsPageTest extends FeatureTestCase ->assertSee('3608400015164657') ->assertDontSee('260901-391328633273048'); - $export = $this->loginAs()->get(route('business.billing-transactions.jst-order-labels.export', [ + $export = $this->loginAs()->get(route('business.planting-data.jst-order-labels.export', [ 'label' => '京喜', ])); $export->assertOk()->assertDownload(); diff --git a/tests/Feature/Business/MarketingAccountBillsTabsTest.php b/tests/Feature/Business/MarketingAccountBillsTabsTest.php index f07d2c1e..db7bdd48 100644 --- a/tests/Feature/Business/MarketingAccountBillsTabsTest.php +++ b/tests/Feature/Business/MarketingAccountBillsTabsTest.php @@ -42,6 +42,12 @@ class MarketingAccountBillsTabsTest extends FeatureTestCase 'marketing-account-bills', 'deposit-account-bills', ], $flowPages); + // 种菜明细表 / 聚水潭订单标签明细已移到并列的「种菜数据汇总」下 + $plantingPages = collect($navigation->firstWhere('slug', 'planting-data')['pages']) + ->pluck('slug')->all(); + $this->assertSame(['planting-details', 'jst-order-labels'], $plantingPages); + $this->assertNotContains('planting-details', $flowPages); + $this->assertNotContains('jst-order-labels', $flowPages); $this->assertSame([ 'bank-balance', 'store-receiving-balance', diff --git a/tests/Feature/Business/PlantingDetailsPageTest.php b/tests/Feature/Business/PlantingDetailsPageTest.php index 4f38699b..5ce95061 100644 --- a/tests/Feature/Business/PlantingDetailsPageTest.php +++ b/tests/Feature/Business/PlantingDetailsPageTest.php @@ -39,7 +39,7 @@ class PlantingDetailsPageTest extends FeatureTestCase $this->assertSame('2026-07-15', $result['date_max']); $page = $this->loginAs()->get(route('business.pages.show', [ - 'section' => 'billing-transactions', + 'section' => 'planting-data', 'page' => 'planting-details', ])); @@ -60,7 +60,7 @@ class PlantingDetailsPageTest extends FeatureTestCase // 按店铺 + 日期筛选 $filtered = $this->loginAs()->get(route('business.pages.show', [ - 'section' => 'billing-transactions', + 'section' => 'planting-data', 'page' => 'planting-details', 'store' => '拼多多-亿家达实木家具官方旗舰店', 'date_from' => '2026-07-01', @@ -71,7 +71,7 @@ class PlantingDetailsPageTest extends FeatureTestCase ->assertDontSee('3306215028042824171'); // 导出:表头 + 行数与页面筛选一致 - $export = $this->loginAs()->get(route('business.billing-transactions.planting-details.export', [ + $export = $this->loginAs()->get(route('business.planting-data.planting-details.export', [ 'store' => '拼多多-亿家达实木家具官方旗舰店', ])); diff --git a/tests/Feature/Settings/NavigationTest.php b/tests/Feature/Settings/NavigationTest.php index e66ba5b4..d5961168 100644 --- a/tests/Feature/Settings/NavigationTest.php +++ b/tests/Feature/Settings/NavigationTest.php @@ -207,10 +207,11 @@ class NavigationTest extends FeatureTestCase 'order-data', 'refunds', 'billing-transactions', + 'planting-data', 'account-balance-data', 'product-inventory', ], - array_slice($slugs, $invoiceIndex, 7) + array_slice($slugs, $invoiceIndex, 8) ); $this->assertSame( [ @@ -219,10 +220,11 @@ class NavigationTest extends FeatureTestCase '订单数据', '退款数据', '账单流水数据', + '种菜数据汇总', '账单余额数据', '商品价格管理', ], - array_column(array_slice($navigation, $invoiceIndex, 7), 'title') + array_column(array_slice($navigation, $invoiceIndex, 8), 'title') ); $this->assertGreaterThan($invoiceIndex, $orderIndex); $this->assertGreaterThan($orderIndex, $refundIndex); From c46a439d7393c65d1f46c2b1cb6b6b59ce62e300 Mon Sep 17 00:00:00 2001 From: qiuxiang <394405259@qq.com> Date: Wed, 30 Sep 2026 17:48:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=81=9A=E6=B0=B4=E6=BD=AD=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=A0=87=E7=AD=BE=E6=98=8E=E7=BB=86=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=80=BB=E6=95=B0=E6=94=B9=E4=B8=BA=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 无筛选时 COUNT(*) 在 233 万行上要 2 秒(冷缓存更久);改为缓存总数(30 分钟,导入时预热)并手工构造分页器,翻页不再重复统计。 --- app/Business/JstOrderLabelOptions.php | 24 ++++++++++++++++++++++++ app/Http/Controllers/Business/Pages.php | 18 +++++++++++++----- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/app/Business/JstOrderLabelOptions.php b/app/Business/JstOrderLabelOptions.php index 18dbbfea..57e2a7dc 100644 --- a/app/Business/JstOrderLabelOptions.php +++ b/app/Business/JstOrderLabelOptions.php @@ -15,6 +15,8 @@ class JstOrderLabelOptions { private const TTL_HOURS = 24; + private const TOTAL_TTL_MINUTES = 30; + private const LIMIT = 500; /** @return list */ @@ -33,12 +35,29 @@ class JstOrderLabelOptions { $this->labels($companyId); $this->shops($companyId); + $this->total($companyId); } public function forget(int $companyId): void { Cache::forget($this->key($companyId, 'label')); Cache::forget($this->key($companyId, 'shop_name')); + Cache::forget($this->totalKey($companyId)); + } + + /** 无筛选时的总行数:233 万行上 COUNT(*) 要 2 秒,缓存后翻页不再重复统计。 */ + public function total(int $companyId): int + { + $key = $this->totalKey($companyId); + $cached = Cache::get($key); + if (is_numeric($cached)) { + return (int) $cached; + } + + $count = (int) JstOrderLabel::query()->where('company_id', $companyId)->count(); + Cache::put($key, $count, now()->addMinutes(self::TOTAL_TTL_MINUTES)); + + return $count; } /** @return list */ @@ -69,4 +88,9 @@ class JstOrderLabelOptions { return "jst-order-labels:options:v1:{$companyId}:{$column}"; } + + private function totalKey(int $companyId): string + { + return "jst-order-labels:total:v1:{$companyId}"; + } } diff --git a/app/Http/Controllers/Business/Pages.php b/app/Http/Controllers/Business/Pages.php index 43366100..12fd263c 100644 --- a/app/Http/Controllers/Business/Pages.php +++ b/app/Http/Controllers/Business/Pages.php @@ -1330,11 +1330,19 @@ class Pages extends Controller $query = $this->jstOrderLabelQuery($filters); $limit = min(max((int) setting('default.list_limit', 25), 10), 100); - $records = $query - ->orderByDesc('ordered_at') - ->orderByDesc('id') - ->paginate($limit) - ->withQueryString(); + $page = max((int) $request->query('page', 1), 1); + $hasFilters = collect($filters)->contains(static fn (string $value): bool => $value !== ''); + // 无筛选时复用缓存总数,避免每次翻页都在 233 万行上重跑 COUNT(*)。 + $total = $hasFilters + ? (clone $query)->count() + : app(\App\Business\JstOrderLabelOptions::class)->total((int) company_id()); + $records = new \Illuminate\Pagination\LengthAwarePaginator( + $query->orderByDesc('ordered_at')->orderByDesc('id')->forPage($page, $limit)->get(), + $total, + $limit, + $page, + ['path' => $request->url(), 'query' => $request->query()], + ); return [ 'view' => 'business.pages.billing-transactions.jst-order-labels',