From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 21 一月 2025 18:15:00 +0800 Subject: [PATCH] 合并代码 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java index 01baa7a..577a556 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java @@ -30,7 +30,7 @@ */ List<Map<String, Object>> queryProvince(String cityCode); - List<TStoreListVo> listAll(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName); + List<TStoreListVo> listAll(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName,Integer objectId); /** * 根据省编号获取所有市 @@ -38,6 +38,9 @@ * @return */ List<Map<String, Object>> queryCity(String provinceCode, String cityCode); + List<Map<String, Object>> queryCity1(); + List<Map<String, Object>> queryCity2(String provinceCode, String cityCode, + Integer type,Integer operatorId); List<Map<String, Object>> queryListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Page<Map<String, Object>> page); @@ -74,4 +77,14 @@ JsDto get(Integer id); List<SelectDto> getSelect(); + + List<TStoreListVo> listAllStore(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName, Integer objectId); + + + List<Map<String, Object>> listStoreAll(Page page, String name, Integer operator, String provinceCode, String cityCode); + + + List<Map<String, Object>> listStoreAllByIds(List<Integer> ids); + List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName,Integer storeId); + } -- Gitblit v1.7.1