From f147a6ae7f543f6db757b3933adaf8f10b896ccf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 20 一月 2025 19:23:17 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
index 5ed3b28..6e2f74b 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
@@ -30,8 +30,8 @@
}
@Override
- public List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Page<Map<String, Object>> page) {
- return this.baseMapper.querySiteListOfpage(provinceCode,cityCode,operatorId,storeName,page);
+ public List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Integer storeId) {
+ return this.baseMapper.querySiteListOfpage(provinceCode,cityCode,operatorId,storeName,storeId);
}
/**
@@ -49,6 +49,10 @@
* @param provinceCode
* @return
*/
+ @Override
+ public List<Map<String, Object>> queryCity2(String provinceCode, String cityCode,Integer type,Integer operatorId) {
+ return this.baseMapper.queryCity2(provinceCode, cityCode,type,operatorId);
+ }
@Override
public List<Map<String, Object>> queryCity(String provinceCode, String cityCode) {
return this.baseMapper.queryCity(provinceCode, cityCode);
@@ -137,4 +141,15 @@
public void updateBenefits(Integer id, String p1) {
this.baseMapper.updateBasicBenefits(id,p1);
}
+
+
+ @Override
+ public List<Map<String, Object>> listStoreAll(Page page, String name, Integer operator, String provinceCode, String cityCode) {
+ return this.baseMapper.listStoreAll(page, name, operator, provinceCode, cityCode);
+ }
+
+ @Override
+ public List<Map<String, Object>> listStoreAllByIds(List<Integer> ids) {
+ return this.baseMapper.listStoreAllByIds(ids);
+ }
}
--
Gitblit v1.7.1