Merge remote-tracking branch 'origin/main'

This commit is contained in:
chenxi 2026-10-07 10:55:58 +08:00
commit 1a024c2b26
5 changed files with 185 additions and 47 deletions

View File

@ -1812,7 +1812,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()
@ -1837,19 +1841,39 @@ class Pages extends Controller
];
}
/** @return array<string,string> */
/** @return array{date_from:string,date_to:string,shop_names:list<string>,labels:list<string>,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<string,string> $filters */
/**
* 多选筛选值归一化:兼容旧的单值参数(?shop_name=A)与新的数组参数(?shop_name[]=A&shop_name[]=B)。
*
* @return list<string>
*/
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<string>,labels:list<string>,keyword:string} $filters */
private function jstOrderLabelQuery(array $filters): \Illuminate\Database\Eloquent\Builder
{
$query = \App\Models\Business\JstOrderLabel::query()->where('company_id', company_id());
@ -1860,11 +1884,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']) . '%');

View File

@ -224,8 +224,11 @@ class CourierFreightReconciliationMirrorRepository
$settings += [
'optimizer_switch' => 'derived_merge=off,derived_with_keys=off',
'join_cache_level' => 8,
'join_buffer_size' => 16777216,
'join_buffer_space_limit' => 33554432,
// 全量汇总要把 300 万行左右的明细和 400 万行的最新关联表做哈希
// 关联;16MB 的哈希表装不下会退化成磁盘多趟扫描(实测超过
// max_statement_time 也跑不完)。128MB 缓冲约 110 秒出结果。
'join_buffer_size' => 134217728,
'join_buffer_space_limit' => 402653184,
];
}
foreach ($settings as $name => $value) {

View File

@ -4,10 +4,15 @@ namespace Modules\EcommerceFinance\Repositories;
use Illuminate\Database\ConnectionInterface;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Facades\Cache;
use Modules\EcommerceFinance\Services\BusinessMirrorDatasetRegistry;
use Throwable;
class OrderDataMirrorRepository
{
/** 完整店铺候选的缓存键(页面店铺多选使用)。 */
public const SHOP_NAMES_CACHE_KEY = 'order-data.shop-candidates:v2';
private const DATASETS = [
'operations_replica.rpt.jst_Orders',
'operations_replica.rpt.jst_OrderItem',
@ -42,20 +47,107 @@ class OrderDataMirrorRepository
*/
public function shopNames(): array
{
// 非淘系 + 淘系两个来源合并去重(淘系店铺名形如"天猫-xx/淘宝-xx")。
$plain = $this->connection->table('ops_jst_orders')
->select('shop_name')->whereNotNull('shop_name')->where('shop_name', '<>', '');
$taobao = $this->connection->table('ops_jst_qmcust_orders')
->select('shop_name')->whereNotNull('shop_name')->where('shop_name', '<>', '');
if (is_array($cached = Cache::get(self::SHOP_NAMES_CACHE_KEY))) {
return array_values($cached);
}
return $plain->union($taobao)
->orderBy('shop_name')
->get()
->pluck('shop_name')
->map(static fn (mixed $name): string => (string) $name)
->unique()
->values()
->all();
// 完整候选要扫订单宽表(shop_name 是 LONGTEXT,非淘系约 30 秒、淘系约
// 2 分钟),不能卡在页面请求里。冷缓存时先返回毫秒级的店铺目录,
// 完整列表放到响应结束后算好再缓存 24 小时。
$this->warmShopNamesCache();
$directory = $this->shopDirectoryNames();
return $directory !== [] ? $directory : $this->computedShopNames();
}
/** 聚水潭店铺目录(约 1300 行):毫秒级返回,作为冷缓存时的候选兜底。 */
private function shopDirectoryNames(): array
{
try {
$rows = $this->connection->table('ops_jst_shop_info')
->select('shop_name')
->distinct()
->whereNotNull('shop_name')
->where('shop_name', '<>', '')
->pluck('shop_name');
} catch (Throwable $exception) {
report($exception);
return [];
}
return $this->normalizeShopNames($rows);
}
private function warmShopNamesCache(): void
{
app()->terminating(function (): void {
$lock = Cache::lock(self::SHOP_NAMES_CACHE_KEY . ':warm', 300);
if (! $lock->get()) {
return;
}
try {
$names = $this->computedShopNames();
if ($names !== []) {
Cache::put(self::SHOP_NAMES_CACHE_KEY, $names, now()->addHours(24));
}
} catch (Throwable $exception) {
report($exception);
} finally {
$lock->release();
}
});
}
/**
* 非淘系 + 淘系两个来源合并去重(淘系店铺名形如"天猫-xx/淘宝-xx")。
*
* 分开各自 DISTINCT 再在 PHP 合并:UNION 会让 MariaDB 把两个上百万行的结果
* 一起物化去重再排序,单次要两三分钟。这里只在响应结束后或缓存不可用时执行。
*
* @return array<int,string>
*/
private function computedShopNames(): array
{
$names = [];
foreach (['ops_jst_orders', 'ops_jst_qmcust_orders'] as $table) {
$rows = $this->connection->table($table)
->select('shop_name')
->distinct()
->whereNotNull('shop_name')
->where('shop_name', '<>', '')
->pluck('shop_name');
foreach ($this->normalizeShopNames($rows) as $name) {
$names[$name] = true;
}
}
$names = array_keys($names);
sort($names, SORT_STRING);
return $names;
}
/** @param iterable<mixed> $rows @return array<int,string> */
private function normalizeShopNames(iterable $rows): array
{
$names = [];
foreach ($rows as $name) {
$name = trim((string) $name);
if ($name !== '') {
$names[$name] = true;
}
}
$names = array_keys($names);
sort($names, SORT_STRING);
return $names;
}
public function promotionReady(): bool

View File

@ -4,7 +4,6 @@ namespace Modules\EcommerceFinance\View;
use Illuminate\Pagination\Paginator;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Cache;
use Modules\EcommerceFinance\Repositories\OrderDataRepository;
use Modules\EcommerceFinance\Repositories\OrderDataMirrorRepository;
use Modules\EcommerceFinance\Repositories\WorkOrderMirrorRepository;
@ -118,7 +117,10 @@ class OrderDataPageData
}
/**
* 店铺多选候选:订单镜像里出现过的店铺名称(缓存 1 小时,避免每次页面请求都扫表去重)。
* 店铺多选候选:订单镜像里出现过的店铺名称。
*
* 完整候选由 OrderDataMirrorRepository::shopNames() 自己缓存 24 小时;冷缓存时
* 它先返回毫秒级的店铺目录,避免页面为了下拉候选卡住两分钟。
*
* @return array<int,string>
*/
@ -126,11 +128,7 @@ class OrderDataPageData
{
try {
$mirror = $this->mirrorOrders ?? app(OrderDataMirrorRepository::class);
$names = Cache::remember(
'order-data.after-sales.shop-options',
now()->addHour(),
fn (): array => $mirror->shopNames(),
);
$names = $mirror->shopNames();
return is_array($names) ? array_values($names) : [];
} catch (Throwable $exception) {

View File

@ -7,6 +7,7 @@
<div class="upstream-data-page upstream-data-page--spaced" data-jst-order-labels="true">
@include('business.pages.partials.upstream-data-styles')
@include('business.pages.partials.multi-select')
<style>
.jst-order-labels-table {
@ -75,23 +76,25 @@
<button class="jst-order-labels-clear" type="button" data-jst-labels-clear="jst-label-date-to" title="清除结束日期" aria-label="清除结束日期">×</button>
</span>
</div>
<div class="upstream-data-field">
<label for="jst-label-shop">店铺名称</label>
<select id="jst-label-shop" name="shop_name">
<option value="">全部店铺</option>
@foreach ($filterOptions['shops'] as $shop)
<option value="{{ $shop }}" @selected(($filters['shop_name'] ?? '') === $shop)>{{ $shop }}</option>
@endforeach
</select>
<div class="upstream-data-field cw-ms" id="jst-label-shop" data-name="shop_name" data-initial='@json($filters['shop_names'] ?? [])'>
<span>店铺名称</span>
<span class="cw-ms__box">
<button type="button" class="cw-ms__btn" data-role="btn" aria-expanded="false">
<span class="cw-ms__label">全部店铺</span><span class="cw-ms__caret">▾</span>
</button>
<span class="cw-ms__panel" data-role="panel" hidden></span>
<span class="cw-ms__values" data-role="values"></span>
</span>
</div>
<div class="upstream-data-field">
<label for="jst-label-label">标签</label>
<select id="jst-label-label" name="label">
<option value="">全部标签</option>
@foreach ($filterOptions['labels'] as $label)
<option value="{{ $label }}" @selected(($filters['label'] ?? '') === $label)>{{ $label }}</option>
@endforeach
</select>
<div class="upstream-data-field cw-ms" id="jst-label-label" data-name="label" data-initial='@json($filters['labels'] ?? [])'>
<span>标签</span>
<span class="cw-ms__box">
<button type="button" class="cw-ms__btn" data-role="btn" aria-expanded="false">
<span class="cw-ms__label">全部标签</span><span class="cw-ms__caret">▾</span>
</button>
<span class="cw-ms__panel" data-role="panel" hidden></span>
<span class="cw-ms__values" data-role="values"></span>
</span>
</div>
<div class="upstream-data-field">
<label for="jst-label-keyword">线上订单号</label>
@ -209,5 +212,18 @@
form.submit();
});
});
if (window.CaiWuMultiSelect) {
window.CaiWuMultiSelect.create(document.getElementById('jst-label-shop'), {
options: @json($filterOptions['shops'] ?? []),
searchable: true,
searchPlaceholder: '打字找店铺',
});
window.CaiWuMultiSelect.create(document.getElementById('jst-label-label'), {
options: @json($filterOptions['labels'] ?? []),
searchable: true,
searchPlaceholder: '打字找标签',
});
}
})();
</script>