From 622c9be21eb91da6fd6a2b407da823a1de358c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=9D=E5=8D=9C?= Date: Tue, 17 Mar 2026 01:27:51 +0800 Subject: [PATCH] Chore: remove duplicate refund_status guard in batchMarkActivated safety valves --- app/Http/Controllers/Admin/PlatformOrderController.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/Http/Controllers/Admin/PlatformOrderController.php b/app/Http/Controllers/Admin/PlatformOrderController.php index 1c883cd..520bf9b 100644 --- a/app/Http/Controllers/Admin/PlatformOrderController.php +++ b/app/Http/Controllers/Admin/PlatformOrderController.php @@ -1902,12 +1902,7 @@ class PlatformOrderController extends Controller // 治理优先：当用户显式筛选「有退款」时，不允许直接批量生效 if ((string) ($filters['refund_status'] ?? '') === 'has') { - return redirect()->back()->with('warning', '当前筛选为「有退款」订单集合。为避免带退款订单直接批量生效，请先完成退款治理（核对退款回执/修正状态）后再执行。'); - } - - // 治理优先：当筛选集合为「有退款」时，不允许直接批量生效 - if ((string) ($filters['refund_status'] ?? '') === 'has') { - return redirect()->back()->with('warning', '当前筛选为「有退款」订单集合。为避免带退款订单被批量推进，请先完成退款治理（核对退款回执/修正状态）后再执行批量仅标记为已生效。'); + return redirect()->back()->with('warning', '当前筛选为「有退款」订单集合。为避免带退款订单直接批量生效，请先完成退款治理（核对退款回执/修正状态）后再执行批量仅标记为已生效。'); } // 治理优先：当筛选集合命中“对账不一致/退款不一致”时，不允许直接批量生效