合并代码

无关风月

2025-01-21 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db

 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, Integer storeId) {
        return this.baseMapper.querySiteListOfpage(provinceCode,cityCode,operatorId,storeName,storeId);
    }

    /**
@@ -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);
    }
}