Merge branch 'after-sale' into dev

app-ghs/controllers/RefundController.php

@@ -460,11 +460,16 @@ class RefundController extends BaseController
         if (!empty($orderSn)) {
             $where['relateOrderSn'] = $orderSn;
         }
-        // 工作台「退款记录」：只查无关联销售单的退款
+        // 可选：只查无关联销售单
         $freeOnly = intval($get['freeOnly'] ?? 0);
         if ($freeOnly === 1) {
             $where['relateOrderSn'] = '';
         }
+        // sameDay：-1全部 1当天售后 0隔天售后
+        $sameDay = isset($get['sameDay']) ? intval($get['sameDay']) : -1;
+        if ($sameDay === 0 || $sameDay === 1) {
+            $where['sameDay'] = $sameDay;
+        }
         $searchTime = $get['searchTime'] ?? '';
         if (!empty($searchTime)) {
             $startTime = $get['startTime'] ?? '';
@@ -474,8 +479,9 @@ class RefundController extends BaseController
         }
 
         $refundSearchTime = $get['refundSearchTime'] ?? '';
-        // 退款记录默认近30天（按售后单创建时间）
-        if ($freeOnly === 1 && empty($refundSearchTime) && empty($searchTime)) {
+        // 工作台退款记录：未传时间时默认近30天
+        $useDefaultLast30 = intval($get['useDefaultLast30'] ?? 0);
+        if ($useDefaultLast30 === 1 && empty($refundSearchTime) && empty($searchTime)) {
             $refundSearchTime = 'last30Days';
         }
         if (!empty($refundSearchTime)) {