diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java index 785bc94..1b5a6d5 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java @@ -69,7 +69,7 @@ public class ProductUserQueryController { public QnPage userPageProductByMatchMaker(PageUtil pageUtil, UserPageProductByMatchmakerQueryParam queryParam, @RequestParam("userId") Long userId) { - return PageUtil.convert(productQueryService.pageProductByMatchmaker(pageUtil), UserPageProductByMatchmakerVo.class); + return PageUtil.convert(productQueryService.pageProductByMatchmaker(pageUtil,queryParam), UserPageProductByMatchmakerVo.class); } @GetMapping("get/product/by/customer/list") diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/ProductViewDao.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/ProductViewDao.java index 65d3025..66091ff 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/ProductViewDao.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/ProductViewDao.java @@ -3,6 +3,7 @@ package com.qniao.dam.infrastructure.persistent.dao.view; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.qniao.dam.api.query.product.user.request.UserPageProductByCustomerQueryParam; +import com.qniao.dam.api.query.product.user.request.UserPageProductByMatchmakerQueryParam; import com.qniao.dam.api.query.product.user.request.UserPageProductByOperatorQueryParam; import com.qniao.dam.api.query.product.user.response.UserPageProductByCustomerExtendVo; import com.qniao.dam.api.query.product.user.response.UserPageProductByCustomerVo; @@ -27,5 +28,6 @@ public interface ProductViewDao { List selectProductByCustomerList(); - IPage pageProductByMatchmaker(Page pageWithoutOrders); + IPage pageProductByMatchmaker(Page pageWithoutOrders, + @Param("queryParam") UserPageProductByMatchmakerQueryParam queryParam); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/ProductQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/ProductQueryService.java index b631e92..f26f577 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/ProductQueryService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/ProductQueryService.java @@ -2,6 +2,7 @@ package com.qniao.dam.query.product; import com.baomidou.mybatisplus.core.metadata.IPage; import com.qniao.dam.api.query.product.user.request.UserPageProductByCustomerQueryParam; +import com.qniao.dam.api.query.product.user.request.UserPageProductByMatchmakerQueryParam; import com.qniao.dam.api.query.product.user.request.UserPageProductByOperatorQueryParam; import com.qniao.dam.api.query.product.user.response.*; import com.qniao.dam.domain.aggregate.productspec.valueobj.ProductSpecTerm; @@ -21,5 +22,5 @@ public interface ProductQueryService { List getPageProductByCustomer(); - IPage pageProductByMatchmaker(PageUtil pageUtil); + IPage pageProductByMatchmaker(PageUtil pageUtil, UserPageProductByMatchmakerQueryParam queryParam); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java index 504fc1e..b7314bb 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.qniao.dam.api.query.product.user.request.UserPageProductByCustomerQueryParam; +import com.qniao.dam.api.query.product.user.request.UserPageProductByMatchmakerQueryParam; import com.qniao.dam.api.query.product.user.request.UserPageProductByOperatorQueryParam; import com.qniao.dam.api.query.product.user.response.*; import com.qniao.dam.domain.aggregate.product.entity.Product; @@ -76,8 +77,8 @@ public class ProductQueryServiceImpl implements ProductQueryService { } @Override - public IPage pageProductByMatchmaker(PageUtil pageUtil) { - return productViewDao.pageProductByMatchmaker(pageUtil.toPageWithoutOrders()); + public IPage pageProductByMatchmaker(PageUtil pageUtil, UserPageProductByMatchmakerQueryParam queryParam) { + return productViewDao.pageProductByMatchmaker(pageUtil.toPageWithoutOrders(),queryParam); } @Override