Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-api/src/main/java/com/gic/store/service/StoreApiService.java

@@ -211,4 +211,6 @@ public interface StoreApiService {
     ServiceResponse<JSONObject> parseStoreSelectJson(String searchJson);
 
     ServiceResponse<List<StoreDTO>> listStoreByStoreInfoId(Integer storeInfoId);
+
+    ServiceResponse<List<StoreDTO>> listStore(String search, Integer enterpriseId);
 }

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

@@ -473,11 +473,23 @@ public class StoreApiServiceImpl implements StoreApiService {
     public ServiceResponse<List<StoreDTO>> listStoreByStoreInfoId(Integer storeInfoId) {
         StoreSearchDBDTO searchDBDTO = new StoreSearchDBDTO();
         searchDBDTO.setStoreInfoId(storeInfoId);
-        com.github.pagehelper.Page<StoreDTO> storeDTOS = this.storeService.listStore(searchDBDTO, 1, Integer.MAX_VALUE);
+        com.github.pagehelper.Page<StoreDTO> storeDTOS = this.storeService.listStore(searchDBDTO, 1, 10000);
         return ServiceResponse.success(storeDTOS.getResult());
     }
 
     @Override
+    public ServiceResponse<List<StoreDTO>> listStore(String search, Integer enterpriseId) {
+        StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
+        storeSearchDTO.setEnterpriseId(enterpriseId);
+        storeSearchDTO.setSearch(search);
+        ServiceResponse<Page<StoreDTO>> response = this.listStore(storeSearchDTO, 1, 10000);
+        if(response.isSuccess() && response.getResult() != null){
+            return ServiceResponse.success(response.getResult().getResult());
+        }
+        return ServiceResponse.success();
+    }
+
+    @Override
     public ServiceResponse<StoreDTO> getStoreById(Integer enterpriseId, Integer storeId) {
         String key = Constants.STORE_KEY + enterpriseId + ":" + storeId;