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/impl/StoreServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 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 f66f1c7..2dc8277 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
@@ -21,8 +21,17 @@
public class StoreServiceImpl extends ServiceImpl<StoreMapper, TStore> implements IStoreService {
@Override
- public List<TStoreListVo> listAll(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName) {
- return this.baseMapper.listAll(page,provinceCode,cityCode,name,phone,shopName);
+ public List<TStoreListVo> listAll(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName,Integer operatorId) {
+ return this.baseMapper.listAll(page,provinceCode,cityCode,name,phone,shopName,operatorId);
+ }
+ @Override
+ public List<TStoreListVo> listAllStore(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName,Integer id) {
+ return this.baseMapper.listAllStore(page,provinceCode,cityCode,name,phone,shopName,id);
+ }
+
+ @Override
+ public List<Map<String, Object>> querySiteListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName) {
+ return this.baseMapper.querySiteListOfpage(provinceCode,cityCode,operatorId,storeName);
}
/**
@@ -41,8 +50,16 @@
* @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);
+ }
+ @Override
+ public List<Map<String, Object>> queryCity1() {
+ return this.baseMapper.queryCity1();
}
@Override
@@ -124,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