门店

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

@@ -725,9 +725,9 @@ public class StoreApiServiceImpl implements StoreApiService {
                     List<JSONObject> listTag = new ArrayList<>();
                     String[] valueArr = data.getJSONObject("data").getString("value").split(" ");
                     for(String s : valueArr){
-                        JSONObject json1 = new JSONObject();
-                        json1.put("type", OperateEnum.OPERATE_AND.getValue());
-                        List<JSONObject> list1 = new ArrayList<>();
+                        JSONObject jsonTmp = new JSONObject();
+                        jsonTmp.put("type", OperateEnum.OPERATE_AND.getValue());
+                        List<JSONObject> listTmp = new ArrayList<>();
                         TabStoreTag storeTag = this.storeTagService.getById(Integer.valueOf(s));
                         if(storeTag == null) {
                             continue;
@@ -739,17 +739,17 @@ public class StoreApiServiceImpl implements StoreApiService {
                         if(StringUtils.isNotBlank(storeWidget.getAuthSearchParam()) && !"{}".equals(storeWidget.getAuthSearchParam())){
                             ServiceResponse<JSONObject> response = this.parseStoreSelectJson(storeWidget.getAuthSearchParam());
                             if(response.isSuccess() && response.getResult() != null){
-                                list1.add(response.getResult());
+                                listTmp.add(response.getResult());
                             }
                         }
                         if(StringUtils.isNotBlank(storeWidget.getSearchParam()) && !"{}".equals(storeWidget.getSearchParam())){
                             ServiceResponse<JSONObject> response = this.parseStoreSelectJson(storeWidget.getSearchParam());
                             if(response.isSuccess() && response.getResult() != null){
-                                list1.add(response.getResult());
+                                listTmp.add(response.getResult());
                             }
                         }
-                        json1.put("list", list1);
-                        listTag.add(json1);
+                        jsonTmp.put("list", listTmp);
+                        listTag.add(jsonTmp);
                     }
                     logger.info("storeTag:{}", JSON.toJSONString(listTag));
                     json.put("list", listTag);
@@ -1571,10 +1571,10 @@ public class StoreApiServiceImpl implements StoreApiService {
             json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STOREID.getField(), OperateEnum.OPERATE_ARR_CONTAIN, storeSearchDTO.getStoreIdsOfNot());
             list.add(json);
             JSONObject notJson = QueryConditionAssemblyUtil.createListQueryNode(list, OperateEnum.OPERATE_AND_NOT);
-            List<JSONObject> list1 = new ArrayList<>();
-            list1.add(enterpriseJson);
-            list1.add(notJson);
-            enterpriseJson = QueryConditionAssemblyUtil.createListQueryNode(list1, OperateEnum.OPERATE_AND);
+            List<JSONObject> listTmp = new ArrayList<>();
+            listTmp.add(enterpriseJson);
+            listTmp.add(notJson);
+            enterpriseJson = QueryConditionAssemblyUtil.createListQueryNode(listTmp, OperateEnum.OPERATE_AND);
         }
         /****build notIn storeInfoId*****/
         if(StringUtils.isNotBlank(storeSearchDTO.getStoreInfoIdsOfNot())){
@@ -1582,10 +1582,10 @@ public class StoreApiServiceImpl implements StoreApiService {
             json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STOREINFOID.getField(), OperateEnum.OPERATE_ARR_CONTAIN, storeSearchDTO.getStoreInfoIdsOfNot());
             list.add(json);
             JSONObject notJson = QueryConditionAssemblyUtil.createListQueryNode(list, OperateEnum.OPERATE_AND_NOT);
-            List<JSONObject> list1 = new ArrayList<>();
-            list1.add(enterpriseJson);
-            list1.add(notJson);
-            enterpriseJson = QueryConditionAssemblyUtil.createListQueryNode(list1, OperateEnum.OPERATE_AND);
+            List<JSONObject> listTmp = new ArrayList<>();
+            listTmp.add(enterpriseJson);
+            listTmp.add(notJson);
+            enterpriseJson = QueryConditionAssemblyUtil.createListQueryNode(listTmp, OperateEnum.OPERATE_AND);
         }
         return enterpriseJson;
     }