linxianzhuang/saasshop
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix refund_status filter to use refund total > 0; add test

Browse Source
This commit is contained in:
萝卜
2026-03-18 00:51:30 +08:00
parent 615a41e382
commit 822ef71072
3 changed files with 126 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/Admin/PlatformOrderController.php
View File

@@ -2501,18 +2501,24 @@ class PlatformOrderController extends Controller
})
->when(($filters['refund_status'] ?? '') !== '', function (Builder $builder) use ($filters) {
// 退款轨迹筛选：
// - has：有退款（refund_summary.total_amount 存在 或 refund_receipts[0].amount 存在）
// - none：无退款（两者都不存在）
// - has：有退款（退款总额 > 0）
// - none：无退款（退款总额 <= 0，或无任何退款字段）
// 退款总额口径：优先 refund_summary.total_amount；缺省回退汇总 refund_receipts[].amount
// 说明：这里不再用“字段是否存在”判断 has/none，避免出现 total_amount=0 但被误判为“有退款”。
$status = (string) ($filters['refund_status'] ?? '');
$driver = $builder->getQuery()->getConnection()->getDriverName();
if ($driver === 'sqlite') {
$refundTotalExpr = "(CASE WHEN JSON_EXTRACT(meta, '$.refund_summary.total_amount') IS NOT NULL THEN CAST(JSON_EXTRACT(meta, '$.refund_summary.total_amount') AS REAL) ELSE (SELECT IFNULL(SUM(CAST(JSON_EXTRACT(value, '$.amount') AS REAL)), 0) FROM json_each(COALESCE(JSON_EXTRACT(meta, '$.refund_receipts'), '[]'))) END)";
} else {
$refundTotalExpr = "(CASE WHEN JSON_EXTRACT(meta, '$.refund_summary.total_amount') IS NOT NULL THEN CAST(JSON_UNQUOTE(JSON_EXTRACT(meta, '$.refund_summary.total_amount')) AS DECIMAL(12,2)) ELSE (SELECT IFNULL(SUM(j.amount), 0) FROM JSON_TABLE(meta, '$.refund_receipts[*]' COLUMNS(amount DECIMAL(12,2) PATH '$.amount')) j) END)";
}
if ($status === 'has') {
$builder->where(function (Builder $q) {
$q->whereRaw("JSON_EXTRACT(meta, '$.refund_summary.total_amount') IS NOT NULL")
->orWhereRaw("JSON_EXTRACT(meta, '$.refund_receipts[0].amount') IS NOT NULL");
});
$builder->whereRaw("ROUND(($refundTotalExpr) * 100) > 0");
} elseif ($status === 'none') {
$builder->whereRaw("JSON_EXTRACT(meta, '$.refund_summary.total_amount') IS NULL")
->whereRaw("JSON_EXTRACT(meta, '$.refund_receipts[0].amount') IS NULL");
$builder->whereRaw("ROUND(($refundTotalExpr) * 100) <= 0");
}
})
->when(($filters['refund_inconsistent'] ?? '') !== '', function (Builder $builder) {