From 40832546dae8628d305a219d2b684ef0c6e86f8c Mon Sep 17 00:00:00 2001 From: qiuxiang <394405259@qq.com> Date: Wed, 7 Oct 2026 10:54:07 +0800 Subject: [PATCH 1/2] =?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=EF=BC=9A=E5=BA=97?= =?UTF-8?q?=E9=93=BA/=E6=A0=87=E7=AD=BE=E7=AD=9B=E9=80=89=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=8F=AF=E6=90=9C=E7=B4=A2=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 店铺名称、标签由原生单选 select 改为项目已有的「可搜索多选」组件(可打字搜索、全选/清空、勾选一条或多条), 结果按 shop_name[]/label[] GET 提交;控制器支持数组并与旧单值参数兼容,店铺 whereIn 精确匹配、多个标签 OR 包含匹配, 页面/分页/导出同口径。生产数据实测:多选店铺 951=951、多选标签 39575=39575、旧单值 92=92 均与独立 SQL 一致。 --- app/Http/Controllers/Business/Pages.php | 47 ++++++++++++++---- .../jst-order-labels.blade.php | 48 ++++++++++++------- 2 files changed, 70 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/Business/Pages.php b/app/Http/Controllers/Business/Pages.php index c4d8b1ba..0cc0ee86 100644 --- a/app/Http/Controllers/Business/Pages.php +++ b/app/Http/Controllers/Business/Pages.php @@ -1806,7 +1806,11 @@ class Pages extends Controller $limit = min(max((int) setting('default.list_limit', 25), 10), 100); $page = max((int) $request->query('page', 1), 1); - $hasFilters = collect($filters)->contains(static fn (string $value): bool => $value !== ''); + $hasFilters = $filters['date_from'] !== '' + || $filters['date_to'] !== '' + || $filters['shop_names'] !== [] + || $filters['labels'] !== [] + || $filters['keyword'] !== ''; // 无筛选时复用缓存总数,避免每次翻页都在 233 万行上重跑 COUNT(*)。 $total = $hasFilters ? (clone $query)->count() @@ -1831,19 +1835,39 @@ class Pages extends Controller ]; } - /** @return array */ + /** @return array{date_from:string,date_to:string,shop_names:list,labels:list,keyword:string} */ private function jstOrderLabelFilters(Request $request): array { return [ 'date_from' => $this->dateFilter($request->query('date_from')), 'date_to' => $this->dateFilter($request->query('date_to')), - 'shop_name' => mb_substr(trim((string) $request->query('shop_name')), 0, 191), - 'label' => mb_substr(trim((string) $request->query('label')), 0, 191), + 'shop_names' => $this->filterValues($request->query('shop_name'), 191), + 'labels' => $this->filterValues($request->query('label'), 191), 'keyword' => mb_substr(trim((string) $request->query('keyword')), 0, 100), ]; } - /** @param array $filters */ + /** + * 多选筛选值归一化:兼容旧的单值参数(?shop_name=A)与新的数组参数(?shop_name[]=A&shop_name[]=B)。 + * + * @return list + */ + private function filterValues(mixed $raw, int $maxLength, int $limit = 500): array + { + $list = is_array($raw) ? $raw : [$raw]; + $values = []; + + foreach ($list as $value) { + $value = mb_substr(trim((string) $value), 0, $maxLength); + if ($value !== '' && ! in_array($value, $values, true)) { + $values[] = $value; + } + } + + return array_slice($values, 0, $limit); + } + + /** @param array{date_from:string,date_to:string,shop_names:list,labels:list,keyword:string} $filters */ private function jstOrderLabelQuery(array $filters): \Illuminate\Database\Eloquent\Builder { $query = \App\Models\Business\JstOrderLabel::query()->where('company_id', company_id()); @@ -1854,11 +1878,16 @@ class Pages extends Controller if ($filters['date_to'] !== '') { $query->where('ordered_at', '<', date('Y-m-d', strtotime($filters['date_to'] . ' +1 day')) . ' 00:00:00'); } - if ($filters['shop_name'] !== '') { - $query->where('shop_name', $filters['shop_name']); + if ($filters['shop_names'] !== []) { + $query->whereIn('shop_name', $filters['shop_names']); } - if ($filters['label'] !== '') { - $query->where('label', 'like', '%' . str_replace(['\\', '%', '_'], ['\\\\', '\\%', '\\_'], $filters['label']) . '%'); + if ($filters['labels'] !== []) { + // 多选标签按「任一命中」过滤,保持与单值时一致的包含匹配语义 + $query->where(function ($sub) use ($filters): void { + foreach ($filters['labels'] as $label) { + $sub->orWhere('label', 'like', '%' . str_replace(['\\', '%', '_'], ['\\\\', '\\%', '\\_'], $label) . '%'); + } + }); } if ($filters['keyword'] !== '') { $query->where('order_no', 'like', '%' . str_replace(['\\', '%', '_'], ['\\\\', '\\%', '\\_'], $filters['keyword']) . '%'); 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 77a6e5b1..0db97c8e 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 @@ -7,6 +7,7 @@
@include('business.pages.partials.upstream-data-styles') + @include('business.pages.partials.multi-select')