|
@@ -603,6 +603,16 @@ public class OrderBaseLogic {
|
|
|
|
|
|
String orderStatus = orderBaseStatusEnum != null ? orderBaseStatusEnum.getKey() : null;
|
|
|
|
|
|
+ if(StringUtils.isNotBlank(keyword)){
|
|
|
+ boolQueryOrder.must(
|
|
|
+ QueryBuilders.boolQuery().should(QueryBuilders.wildcardQuery("id", keyword))
|
|
|
+ .should(QueryBuilders.wildcardQuery("user_name", keyword))
|
|
|
+ .should(QueryBuilders.wildcardQuery("order_small_type_text", keyword))
|
|
|
+ .should(QueryBuilders.wildcardQuery("user_mobile", keyword))
|
|
|
+ .should(QueryBuilders.wildcardQuery("address", keyword))
|
|
|
+ );
|
|
|
+ }
|
|
|
+
|
|
|
if(StringUtils.equals(orderStatus, OrderBaseStatusEnum.DJD.getKey())) {
|
|
|
boolQueryOrder.must(
|
|
|
QueryBuilders.boolQuery().should(QueryBuilders.termsQuery("is_import_excel", false))
|