From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
index 4935222..dae6510 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
@@ -19,7 +19,7 @@
* @date 2023/7/6 16:51
*/
public interface StoreMapper extends BaseMapper<TStore> {
- List<TStoreListVo> listAll(@Param("page") Page<TStoreListVo> page, @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode, @Param("name") String name, @Param("phone") String phone, @Param("shopName") String shopName);
+ List<TStoreListVo> listAll(@Param("page") Page<TStoreListVo> page, @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode, @Param("name") String name, @Param("phone") String phone, @Param("shopName") String shopName, @Param("operatorId") Integer operatorId);
/**
@@ -34,7 +34,13 @@
* @param provinceCode
* @return
*/
- List<Map<String, Object>> queryCity(@Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode);
+ List<Map<String, Object>> queryCity(@Param("provinceCode") String provinceCode,
+ @Param("cityCode") String cityCode);
+ List<Map<String, Object>> queryCity2(@Param("provinceCode") String provinceCode,
+ @Param("cityCode") String cityCode,
+ @Param("type") Integer type,
+ @Param("operatorId") Integer operatorId);
+ List<Map<String, Object>> queryCity1();
List<Map<String, Object>> queryListOfpage(@Param("provinceCode") String provinceCode,
@Param("cityCode") String cityCode,
@@ -75,4 +81,27 @@
List<TStoreListVo> listAllStore(@Param("page") Page<TStoreListVo> page, @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode, @Param("name") String name, @Param("phone") String phone, @Param("shopName") String shopName, @Param("id") Integer id);
+
+
+ List<Map<String, Object>> listStoreAll(Page page, @Param("name") String name,
+ @Param("operator") Integer operator, @Param("provinceCode") String provinceCode,
+ @Param("cityCode") String cityCode);
+
+
+
+ List<Map<String, Object>> listStoreAllByIds(@Param("ids") List<Integer> ids);
+ List<Map<String, Object>> querySiteListOfpage(@Param("provinceCode") String provinceCode,
+ @Param("cityCode") String cityCode,
+ @Param("operatorId") Integer operatorId,
+ @Param("storeName") String storeName,
+ @Param("storeId") Integer storeId
+ );
+ List<Map<String, Object>> querySiteListOfpageOperator(@Param("provinceCode") String provinceCode,
+ @Param("cityCode") String cityCode,
+ @Param("operatorId") Integer operatorId,
+ @Param("storeName") String storeName,
+ @Param("storeIds") List<Integer> storeIds
+ );
+
+
}
--
Gitblit v1.7.1