From 328105ebdbb82a923c2a02ed01786c129a4aacb1 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 23 十月 2025 17:33:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action

---
 framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java b/framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java
index e597687..120f05c 100644
--- a/framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java
+++ b/framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java
@@ -168,6 +168,14 @@
                         "        \"type\": \"date\",\n" +
                         "        \"format\": \"yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis\"\n" +
                         "      },\n" +
+                        "      \"preSaleEndDate\": {\n" +
+                        "        \"type\": \"date\",\n" +
+                        "        \"format\": \"yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis\"\n" +
+                        "      },\n" +
+                        "      \"preSaleBeginDate\": {\n" +
+                        "        \"type\": \"date\",\n" +
+                        "        \"format\": \"yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis\"\n" +
+                        "      },\n" +
                         "      \"categoryPath\": {\n" +
                         "        \"type\": \"text\",\n" +
                         "        \"fielddata\": true,\n" +
@@ -192,6 +200,9 @@
                         "        \"type\": \"long\"\n" +
                         "      },\n" +
                         "      \"skuSource\": {\n" +
+                        "        \"type\": \"long\"\n" +
+                        "      },\n" +
+                        "      \"goodsSort\": {\n" +
                         "        \"type\": \"long\"\n" +
                         "      },\n" +
                         "      \"goodsId\": {\n" +
@@ -266,6 +277,15 @@
                         "          }\n" +
                         "        }\n" +
                         "      },\n" +
+                        "      \"customizeFlag\": {\n" +
+                        "        \"type\": \"text\",\n" +
+                        "        \"fields\": {\n" +
+                        "          \"keyword\": {\n" +
+                        "            \"type\": \"keyword\",\n" +
+                        "            \"ignore_above\": 256\n" +
+                        "          }\n" +
+                        "        }\n" +
+                        "      },\n" +
                         "      \"point\": {\n" +
                         "        \"type\": \"long\"\n" +
                         "      },\n" +

--
Gitblit v1.8.0