From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 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 2f7aca9..1840526 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
@@ -3,7 +3,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.guns.modular.system.model.*;
+import com.dsh.guns.modular.system.model.dto.SelectDto;
import io.swagger.models.auth.In;
+import com.dsh.course.dto.JsDto;
+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;
@@ -24,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);
/**
* 根据省编号获取所有市
@@ -32,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);
@@ -62,4 +71,20 @@
void updateBasicConfig(Integer id , String p1);
void updateBenefits(Integer id , String p1);
+
+ void insert(JsDto jsDto);
+
+ 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);
+
}
--
Gitblit v1.7.1