diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java index 8ea4f39ad..a6dc15c12 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -1,11 +1,15 @@ package com.iformall.controller; +import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxMerchantVo; +import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.WxMerchantService; import com.iformall.utils.HashUtil; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -26,6 +30,17 @@ public class WxMerchantController extends BaseController { @Autowired private WxMerchantService wxMerchantService; + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxMerchantVo wxMerchant, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); + if (null == wxMerchant) wxMerchant = new WxMerchantVo(); + wxMerchant.setMerchantStatus(EnumMerchantStatus.VALID.getCode()); + return new ResultData(wxMerchantService.listAsPageCVo(wxMerchant, pageNum, pageSize)); + } @ApiOperation("根据code查询接口") @GetMapping("/findByCode") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 6979d26b2..7de6bf29e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -8,7 +8,7 @@ import com.iformall.domain.vo.WxMerchantVo; public interface WxMerchantMapper extends CommonMapper { List findList(WxMerchant wxMerchant); - + List findListCVo(WxMerchantVo wxMerchantVo); WxMerchantVo getMerchantByCode(HashMap params); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index fe94ba44c..e5ce57f7a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -23,7 +23,7 @@ public interface WxMerchantService { * @return */ PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize); - + PageInfo listAsPageCVo(WxMerchantVo record, Integer pageIndex, Integer pageSize); /** * 根据code查询 * diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index d435b4f71..bc71606f7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -104,6 +104,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { return pageInfo; } + + @Override + public PageInfo listAsPageCVo(WxMerchantVo record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findListCVo(record)); + } + @Override public WxMerchantVo getMerchantInfo(HashMap params) { return wxMerchantMapper.getMerchantByCode(params); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 33399fd3d..990415d5e 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -92,20 +92,20 @@ - + m.id, - m.img_url,m.name,m.link_phone,m.status, + m.img_url,m.name,m.link_phone,m.status,m.business_id, s.addr,s.shop_number,s.baidu_poi, mb.building_name,mf.floor_name - + - + @@ -115,9 +115,9 @@ - select - + FROM wx_merchant m left join wx_merchant_shop ms on ms.merchant_id = m.id and ms.is_del = 0 left join wx_shop s on ms.shop_id = s.id @@ -136,5 +136,43 @@ +