Merge remote-tracking branch 'origin/master'

liujie

2023-08-07 f5ca8f01cf6b8256a25e8c6838d805fe3fca43fc

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java

@@ -1,10 +1,14 @@
package com.dsh.guns.modular.system.service.impl;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.course.mapper.StoreMapper;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.model.TStoreListVo;
import com.dsh.guns.modular.system.service.IStoreService;
import org.springframework.stereotype.Service;

import java.util.List;

import java.util.List;
import java.util.Map;
@@ -12,6 +16,10 @@
@Service
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);
    }

    /**
     * 获取所有省
@@ -32,4 +40,9 @@
    public List<Map<String, Object>> queryCity(String provinceCode, String cityCode) {
        return this.baseMapper.queryCity(provinceCode, cityCode);
    }

    @Override
    public List<Map<String, Object>> queryListOfpage(String provinceCode, String cityCode, Integer cityManagerId, String storeName, Page<Map<String, Object>> page) {
        return this.baseMapper.queryListOfpage(provinceCode,cityCode,cityManagerId,storeName,page);
    }
}