Merge remote-tracking branch 'origin/developer' into developer

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -593,7 +593,7 @@ public class StoreApiServiceImpl implements StoreApiService {
         dynamicSearchDTO.setReturnFileds(returnFileds);
         logger.info("es查询条件：{}", JSON.toJSONString(dynamicSearchDTO,true));
         ServiceResponse<ESResponseQueryBatchDTO> response = this.esBusinessOperaApiService.queryDataBatch(dynamicSearchDTO, false, null);
-        logger.info("es查询结果：,{}", JSON.toJSONString(response, true));
+        logger.info("es查询结果：,{}", response.getResult().getRes().size());
         return response;
     }
 
@@ -1478,10 +1478,6 @@ public class StoreApiServiceImpl implements StoreApiService {
             json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STOREID.getField(), OperateEnum.OPERATE_ARR_CONTAIN, storeSearchDTO.getStoreIds());
             jsonObjectList.add(json);
         }
-        if (StringUtils.isNotBlank(storeSearchDTO.getStoreIdsOfNot())) {
-            json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STOREID.getField(), OperateEnum.OPERATE_NOT_CONTAIN, storeSearchDTO.getStoreIdsOfNot());
-            jsonObjectList.add(json);
-        }
         if(StringUtils.isNotBlank(storeSearchDTO.getStoreInfoIds())){
             json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STOREINFOID.getField(), OperateEnum.OPERATE_ARR_CONTAIN, storeSearchDTO.getStoreInfoIds());
             jsonObjectList.add(json);
@@ -1533,13 +1529,16 @@ public class StoreApiServiceImpl implements StoreApiService {
             }
         }
         enterpriseJson = QueryConditionAssemblyUtil.createListQueryNode(jsonObjectList, OperateEnum.OPERATE_AND);
-        //build notIn search
+        /***build notIn search****/
         if(StringUtils.isNotBlank(storeSearchDTO.getStoreIdsOfNot())){
             List<JSONObject> list = new ArrayList<>();
-            list.add(this.buildSearchJSON(storeSearchDTO));
             json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STOREID.getField(), OperateEnum.OPERATE_ARR_CONTAIN, storeSearchDTO.getStoreIdsOfNot());
             list.add(json);
-            enterpriseJson = QueryConditionAssemblyUtil.createListQueryNode(list, OperateEnum.OPERATE_AND_NOT);
+            JSONObject notJSON = QueryConditionAssemblyUtil.createListQueryNode(list, OperateEnum.OPERATE_AND_NOT);
+            List<JSONObject> _list = new ArrayList<>();
+            _list.add(enterpriseJson);
+            _list.add(notJSON);
+            enterpriseJson = QueryConditionAssemblyUtil.createListQueryNode(_list, OperateEnum.OPERATE_AND);
         }
         return enterpriseJson;
     }