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

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

@@ -210,6 +210,11 @@ public class StoreApiServiceImpl implements StoreApiService {
 
         // 更新缓存
         refreshCache(storeDTO.getEnterpriseId(), storeDTO.getStoreId());
+        JSONObject json = new JSONObject();
+        json.put("enterpriseId", storeDTO.getEnterpriseId());
+        json.put("storeId", storeDTO.getStoreId());
+        json.put("logId", -1);
+        this.addStoreToIndexMq(json.toJSONString());
         return ServiceResponse.success(storeDTO);
     }
 
@@ -1449,9 +1454,7 @@ public class StoreApiServiceImpl implements StoreApiService {
         if (StringUtils.isNotBlank(storeSearchDTO.getSearch())) {
             JSONObject storeNameSearch = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STORENAME.getField(), OperateEnum.OPERATE_LIKE, storeSearchDTO.getSearch());
             JSONObject storeCodeSearch = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STORECODE.getField(), OperateEnum.OPERATE_LIKE, storeSearchDTO.getSearch());
-            JSONObject storeAreaSearch = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.PROVINCES.getField(), OperateEnum.OPERATE_LIKE, storeSearchDTO.getSearch());
             List<JSONObject> list = new ArrayList<>();
-            list.add(storeAreaSearch);
             list.add(storeCodeSearch);
             list.add(storeNameSearch);
             json = QueryConditionAssemblyUtil.createListQueryNode(list, OperateEnum.OPERATE_OR);
@@ -1516,6 +1519,14 @@ public class StoreApiServiceImpl implements StoreApiService {
             }
         }
         enterpriseJson = QueryConditionAssemblyUtil.createListQueryNode(jsonObjectList, OperateEnum.OPERATE_AND);
+        //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);
+        }
         return enterpriseJson;
     }