From 41c07e4558ed3a1cbdda0711f78cd3a812c06829 Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期四, 28 九月 2023 18:34:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 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 95ddcac..bd5206a 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 @@ -1,8 +1,11 @@ package com.dsh.guns.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.dsh.guns.modular.system.model.Dict; import com.dsh.guns.modular.system.model.TStore; +import com.dsh.guns.modular.system.model.TStoreListVo; +import com.dsh.guns.modular.system.model.TTurn; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -23,6 +26,7 @@ */ List<Map<String, Object>> queryProvince(String cityCode); + List<TStoreListVo> listAll(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName); /** * 根据省编号获取所有市 @@ -30,4 +34,29 @@ * @return */ List<Map<String, Object>> queryCity(String provinceCode, String cityCode); + + List<Map<String, Object>> queryListOfpage(String provinceCode, String cityCode, Integer cityManagerId, String storeName, Page<Map<String, Object>> page); + + List<Map<String, Object>> listOne(Page<Map<String, Object>> page, Integer id); + + + List<Map<String, Object>> typeChange(String name); + + List<Map<String, Object>> typeChangeOne(Integer id); + + void addConfigOne(String url, String name, Integer page,Integer type, String turnId, Integer sort); + + List<Map<String, Object>> listTwo(Page<Map<String, Object>> page); + + + void delete1(Integer id); + + + /** + * 获取所有跳转页面 + * @return + */ + List<TTurn> pageList(); + + List<TTurn> getPage(List<Integer> ids); } -- Gitblit v1.7.1