订单es

conf/esTemplate/businessorder.json

@@ -6,11 +6,43 @@
       },
       "orderName": {
         "type": "text",
-        "index": "not_analyzed"
+        "analyzer": "index_ansj",
+        "search_analyzer": "query_ansj",
+        "fields": {
+          "raw": {
+            "type": "keyword"
+          },
+          "number": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "number_analyzer"
+          },
+          "letter": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "letter_analyzer"
+          }
+        }
       },
       "orderCode": {
         "type": "text",
-        "index": "not_analyzed"
+        "analyzer": "index_ansj",
+        "search_analyzer": "query_ansj",
+        "fields": {
+          "raw": {
+            "type": "keyword"
+          },
+          "number": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "number_analyzer"
+          },
+          "letter": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "letter_analyzer"
+          }
+        }
       },
       "orderStatus": {
         "type": "integer"
@@ -24,7 +56,23 @@
       },
       "incomePlatformOrderCode": {
         "type": "text",
-        "index": "not_analyzed"
+        "analyzer": "index_ansj",
+        "search_analyzer": "query_ansj",
+        "fields": {
+          "raw": {
+            "type": "keyword"
+          },
+          "number": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "number_analyzer"
+          },
+          "letter": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "letter_analyzer"
+          }
+        }
       },
       "incomePlatformOrderTimeLong": {
         "type": "long"
@@ -37,7 +85,23 @@
       },
       "storeName": {
         "type": "text",
-        "index": "not_analyzed"
+        "analyzer": "index_ansj",
+        "search_analyzer": "query_ansj",
+        "fields": {
+          "raw": {
+            "type": "keyword"
+          },
+          "number": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "number_analyzer"
+          },
+          "letter": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "letter_analyzer"
+          }
+        }
       },
       "deliverFee": {
         "type": "double"

conf/esTemplate/orderdeliveryinfo.json

@@ -12,31 +12,123 @@
       },
       "deliverProvince": {
         "type": "text",
-        "index": "not_analyzed"
+        "analyzer": "index_ansj",
+        "search_analyzer": "query_ansj",
+        "fields": {
+          "raw": {
+            "type": "keyword"
+          },
+          "number": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "number_analyzer"
+          },
+          "letter": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "letter_analyzer"
+          }
+        }
       },
       "deliverCity": {
         "type": "text",
-        "index": "not_analyzed"
+        "analyzer": "index_ansj",
+        "search_analyzer": "query_ansj",
+        "fields": {
+          "raw": {
+            "type": "keyword"
+          },
+          "number": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "number_analyzer"
+          },
+          "letter": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "letter_analyzer"
+          }
+        }
       },
       "deliverDistract": {
         "type": "text",
-        "index": "not_analyzed"
+        "analyzer": "index_ansj",
+        "search_analyzer": "query_ansj",
+        "fields": {
+          "raw": {
+            "type": "keyword"
+          },
+          "number": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "number_analyzer"
+          },
+          "letter": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "letter_analyzer"
+          }
+        }
       },
       "deliverAddress": {
         "type": "text",
-        "index": "not_analyzed"
+        "analyzer": "index_ansj",
+        "search_analyzer": "query_ansj",
+        "fields": {
+          "raw": {
+            "type": "keyword"
+          },
+          "number": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "number_analyzer"
+          },
+          "letter": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "letter_analyzer"
+          }
+        }
       },
       "geoLocationSerial": {
         "type": "text",
-        "index": "not_analyzed"
+        "analyzer": "index_ansj",
+        "search_analyzer": "query_ansj",
+        "fields": {
+          "raw": {
+            "type": "keyword"
+          }
+        }
       },
       "receiveMan": {
         "type": "text",
-        "index": "not_analyzed"
+        "analyzer": "index_ansj",
+        "search_analyzer": "query_ansj",
+        "fields": {
+          "raw": {
+            "type": "keyword"
+          },
+          "number": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "number_analyzer"
+          },
+          "letter": {
+            "type": "text",
+            "index": "analyzed",
+            "analyzer": "letter_analyzer"
+          }
+        }
       },
       "contractPhone": {
         "type": "text",
-        "index": "not_analyzed"
+        "analyzer": "index_ansj",
+        "search_analyzer": "query_ansj",
+        "fields": {
+          "raw": {
+            "type": "keyword"
+          }
+        }
       },
       "deliverTimeliness": {
         "type": "integer"

conf/script/1000/init/Init_16_BusinessOrder.groovy

@@ -0,0 +1,27 @@
+import com.dderp.business.dao.OrderDao
+import com.dderp.common.api.SupplierInitService
+import com.dderp.common.datas.ESKeys
+import com.dySweetFishPlugin.elasticsearch.ESClient
+import com.dySweetFishPlugin.redis.RedisService
+import com.sweetfish.convert.json.JsonConvert
+import com.sweetfish.util.Utility
+import org.apache.logging.log4j.Logger
+
+static def createRunnable(ESClient esClient, RedisService redisService, SupplierInitService supplierService,
+                          OrderDao orderDao, Logger logger, JsonConvert jsonConvert, String dataSourceId, long supplierCode) {
+    return {
+        esClient.checkIndexEx(supplierService.getDateYearESIndex(supplierCode, ESKeys.ES_DELIVER_BUSINESS_ORDER_INDEX, 0),
+                ESKeys.INDEX_CONFIG,
+                Utility.ofMap(ESKeys.ES_DELIVER_BUSINESS_ORDER_TYPE, "businessorder.json",
+                        ESKeys.ES_DELIVER_ORDER_DELIVERY_INFO_TYPE, "orderdeliveryinfo.json",
+                        ESKeys.ES_DELIVER_ORDER_FINANCES_TYPE, "orderfinances.json",
+                        ESKeys.ES_DELIVER_ORDER_DETAIL_ITEM_TYPE, "orderdetailitem.json"))
+
+        esClient.checkIndexEx(supplierService.getDateYearESIndex(supplierCode, ESKeys.ES_DELIVER_ORDER_STEP_INDEX, 0),
+                ESKeys.INDEX_CONFIG,
+                Utility.ofMap(ESKeys.ES_DELIVER_ORDER_STEP_TYPE, "orderStep.json"))
+
+    } as Runnable
+}
+
+createRunnable(esClient, redisService, supplierService, orderDao, logger, jsonConvert, dataSourceId, supplierCode)

conf/sqlroot/com/dderp/business/dao/OrderDao.dql

@@ -1,6 +1,19 @@
 -- [queryBusinessOrderList]
 select * from $table$;
 
+-- [queryOrderFinancesList]
+select * from $table$;
+
+-- [queryOrderDeliveryInfoList]
+select * from $table$;
+
+-- [queryOrderDetailItemList]
+select * from $table$;
+
+-- [queryOrderStepList]
+select * from $table$;
+
+
 -- [addBusinessOrder]
 insert into $table$ (id, orderName, orderCode, orderStatus,
 incomePlatformId, incomePlatformName, incomePlatformOrderCode,

ddBusiness/src/main/java/com/dderp/business/dao/OrderDao.java

@@ -12,7 +12,27 @@ public interface OrderDao extends DaoRepository {
     @Sharding(databaseShardingStrategy = SupplierDataBaseShardingStrategy.class, tableShardingStrategy = OrderTableShardingStrategy.class)
     @DAOMethod(operator = OperatorType.QUERY, owait = OperatorWait.AWAIT)
     @SqlId(clazz = OrderDao.class, sql = "queryBusinessOrderList", table = "deBusinessOrder", tableParam = 4, params = {1})
-    List<StoreBrand> queryBusinessOrderList(RMap params, PageFlipper pageFlipper, @DatabaseShardingBy String dataSourceId, String tableKey);
+    List<BusinessOrder> queryBusinessOrderList(RMap params, PageFlipper pageFlipper, @DatabaseShardingBy String dataSourceId, String tableKey);
+
+    @Sharding(databaseShardingStrategy = SupplierDataBaseShardingStrategy.class, tableShardingStrategy = OrderTableShardingStrategy.class)
+    @DAOMethod(operator = OperatorType.QUERY, owait = OperatorWait.AWAIT)
+    @SqlId(clazz = OrderDao.class, sql = "queryOrderFinancesList", table = "deOrderFinances", tableParam = 4, params = {1})
+    List<OrderFinances> queryOrderFinancesList(RMap params, PageFlipper pageFlipper, @DatabaseShardingBy String dataSourceId, String tableKey);
+
+    @Sharding(databaseShardingStrategy = SupplierDataBaseShardingStrategy.class, tableShardingStrategy = OrderTableShardingStrategy.class)
+    @DAOMethod(operator = OperatorType.QUERY, owait = OperatorWait.AWAIT)
+    @SqlId(clazz = OrderDao.class, sql = "queryOrderDeliveryInfoList", table = "deOrderDeliveryInfo", tableParam = 4, params = {1})
+    List<OrderDeliveryInfo> queryOrderDeliveryInfoList(RMap params, PageFlipper pageFlipper, @DatabaseShardingBy String dataSourceId, String tableKey);
+
+    @Sharding(databaseShardingStrategy = SupplierDataBaseShardingStrategy.class, tableShardingStrategy = OrderTableShardingStrategy.class)
+    @DAOMethod(operator = OperatorType.QUERY, owait = OperatorWait.AWAIT)
+    @SqlId(clazz = OrderDao.class, sql = "queryOrderDetailItemList", table = "deOrderDetailItem", tableParam = 4, params = {1})
+    List<OrderDetailItem> queryOrderDetailItemList(RMap params, PageFlipper pageFlipper, @DatabaseShardingBy String dataSourceId, String tableKey);
+
+    @Sharding(databaseShardingStrategy = SupplierDataBaseShardingStrategy.class, tableShardingStrategy = OrderTableShardingStrategy.class)
+    @DAOMethod(operator = OperatorType.QUERY, owait = OperatorWait.AWAIT)
+    @SqlId(clazz = OrderDao.class, sql = "queryOrderStepList", table = "deOrderStep", tableParam = 4, params = {1})
+    List<OrderStep> queryOrderStepList(RMap params, PageFlipper pageFlipper, @DatabaseShardingBy String dataSourceId, String tableKey);
 
     @Sharding(databaseShardingStrategy = SupplierDataBaseShardingStrategy.class, tableShardingStrategy = OrderTableShardingStrategy.class)
     @DAOMethod(operator = OperatorType.UPDATE, owait = OperatorWait.ASNYC)

ddBusiness/src/main/java/com/dderp/business/service/SupplierInitImpl.java

@@ -133,6 +133,8 @@ public class SupplierInitImpl extends BaseService implements SupplierInitService
 
     private StoreDao storeDao;
 
+    private OrderDao orderDao;
+
     private ExecutorService initInfoExecutor;
 
     private final List<ScheduledThreadPoolExecutor> scheduleThreadList = new ArrayList<>();
@@ -227,6 +229,7 @@ public class SupplierInitImpl extends BaseService implements SupplierInitService
         docDao = tunaService.generate(DocDao.class);
         platformDao = tunaService.generate(PlatformDao.class);
         storeDao = tunaService.generate(StoreDao.class);
+        orderDao = tunaService.generate(OrderDao.class);
 
         AnyValue environmentValue = config.getAnyValue("environment");
         if (environmentValue != null) {
@@ -356,6 +359,7 @@ public class SupplierInitImpl extends BaseService implements SupplierInitService
                 "docDao", docDao,
                 "platformDao", platformDao,
                 "storeDao", storeDao,
+                "orderDao", orderDao,
                 "jsonConvert", jsonConvert,
                 "dataSourceId", dataSourceId,
                 "supplierCode", supplierCode,