diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LklTkController.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LklTkController.java index a309497a..735007d6 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LklTkController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LklTkController.java @@ -9,9 +9,8 @@ package com.suisung.mall.shop.lakala.controller.mobile; import cn.hutool.json.JSONObject; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.suisung.mall.common.api.CommonResult; -import com.suisung.mall.common.modules.lakala.LklBanks; import com.suisung.mall.common.service.impl.BaseControllerImpl; import com.suisung.mall.shop.lakala.service.LklBanksService; import com.suisung.mall.shop.lakala.service.impl.LklTkServiceImpl; @@ -26,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.util.Map; @Api(tags = "拉卡拉商户进件控制器") @RestController @@ -50,7 +50,8 @@ public class LklTkController extends BaseControllerImpl { @ApiOperation(value = "搜索国内银行(支行)分页列表", notes = "搜索国内银行(支行)分页列表,数据包含有效的收款结清行号") @RequestMapping(value = "/bank/search", method = RequestMethod.POST) public CommonResult searchLklBanksPageList(@RequestBody JSONObject paramsJSON) { - Page list = lklBanksService.searchBranchBanksPageList(paramsJSON.getStr("keyword"), paramsJSON.getInt("pageNum"), paramsJSON.getInt("pageSize")); +// Page list = lklBanksService.searchBranchBanksPageList(paramsJSON.getStr("keyword"), paramsJSON.getInt("pageNum"), paramsJSON.getInt("pageSize")); + IPage list = lklBanksService.pageBranchBanksList("", "", 2, paramsJSON.getStr("keyword"), paramsJSON.getInt("pageNum"), paramsJSON.getInt("pageSize")); return CommonResult.success(list); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/mapper/LklBanksMapper.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/mapper/LklBanksMapper.java index fcf12d4e..c017aa46 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/mapper/LklBanksMapper.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/mapper/LklBanksMapper.java @@ -9,10 +9,18 @@ package com.suisung.mall.shop.lakala.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.suisung.mall.common.modules.lakala.LklBanks; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.Map; + @Repository public interface LklBanksMapper extends BaseMapper { + + IPage pageBranchBanksList(Page page, @Param("bankNo") String bankNo, @Param("branchBankNo") String branchBankNo, @Param("type") Integer type, @Param("keywords") List keywords); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklBanksService.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklBanksService.java index 347ac4cd..7edeeb9e 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklBanksService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/LklBanksService.java @@ -8,9 +8,12 @@ package com.suisung.mall.shop.lakala.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.suisung.mall.common.modules.lakala.LklBanks; +import java.util.Map; + public interface LklBanksService { /** @@ -22,4 +25,7 @@ public interface LklBanksService { * @return */ Page searchBranchBanksPageList(String keyword, Integer pageNum, Integer pageSize); + + + IPage pageBranchBanksList(String bankNo, String branchBankNo, Integer type, String keyword, Integer pageNum, Integer pageSize); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklBanksServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklBanksServiceImpl.java index 1a7795da..4d9a15c9 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklBanksServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklBanksServiceImpl.java @@ -10,6 +10,7 @@ package com.suisung.mall.shop.lakala.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.suisung.mall.common.constant.CommonConstant; import com.suisung.mall.common.modules.lakala.LklBanks; @@ -22,6 +23,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; +import java.util.Map; @Slf4j @Service @@ -30,6 +32,9 @@ public class LklBanksServiceImpl extends BaseServiceImpl pageBranchBanksList(String bankNo, String branchBankNo, Integer type, String keyword, Integer pageNum, Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + return lklBanksMapper.pageBranchBanksList(page, bankNo, branchBankNo, type, jiebaUtils.segmentForSearch(keyword)); + } } diff --git a/mall-shop/src/main/resources/mapper/lakala/LklBanksMapper.xml b/mall-shop/src/main/resources/mapper/lakala/LklBanksMapper.xml index 8e026578..8d914dae 100644 --- a/mall-shop/src/main/resources/mapper/lakala/LklBanksMapper.xml +++ b/mall-shop/src/main/resources/mapper/lakala/LklBanksMapper.xml @@ -5,4 +5,45 @@ * + +