Merge branch 'master' of https://gitee.com/v_cms/zyt

2026-05-12 18:15:10 +08:00
parent 4caa98af3a fabaa84373
commit fdcfa30810
286 changed files with 709 additions and 380 deletions
@@ -77,6 +77,23 @@ class CustomerLists extends BaseAdminDataLists implements ListsSearchInterface
            }
        }

+        // 添加时间：与 lists 排序口径一致（external_first_add_time 优先，0 则 create_time）
+        $addStart = trim((string) ($this->params['add_time_start'] ?? ''));
+        $addEnd = trim((string) ($this->params['add_time_end'] ?? ''));
+        $effExpr = 'COALESCE(NULLIF(external_first_add_time, 0), create_time)';
+        if ($addStart !== '') {
+            $t = strtotime($addStart . ' 00:00:00');
+            if ($t !== false) {
+                $query->whereRaw($effExpr . ' > 0 AND ' . $effExpr . ' >= ?', [$t]);
+            }
+        }
+        if ($addEnd !== '') {
+            $t = strtotime($addEnd . ' 23:59:59');
+            if ($t !== false) {
+                $query->whereRaw($effExpr . ' > 0 AND ' . $effExpr . ' <= ?', [$t]);
+            }
+        }
+
        return $query;
    }