diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/eso/EntrustServiceOrderDao.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/eso/EntrustServiceOrderDao.java index 743deef..258a413 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/eso/EntrustServiceOrderDao.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/eso/EntrustServiceOrderDao.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderByInitiatorQueryParams; +import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderByMatchmakerQueryParams; import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByInitiatorVo; +import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByMatchmakerVo; import com.qniao.dam.domain.aggregate.eso.entity.EntrustServiceOrder; import org.apache.ibatis.annotations.Param; @@ -16,4 +18,7 @@ import org.apache.ibatis.annotations.Param; public interface EntrustServiceOrderDao extends BaseMapper { IPage pageOrderByInitiator(Page pageWithoutOrders, @Param("queryParams") PageEntrustServiceOrderByInitiatorQueryParams queryParams); + + IPage pageOrderByMatchmaker(Page pageWithoutOrders, + @Param("queryParams") PageEntrustServiceOrderByMatchmakerQueryParams queryParams); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java index 3659c5c..d569dc3 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java @@ -58,6 +58,13 @@ public class EntrustServiceOrderQueryServiceImpl implements EntrustServiceOrderQ @Override public IPage pageOrderByMatchmaker(PageUtil pageUtil, PageEntrustServiceOrderByMatchmakerQueryParams queryParams) { - return null; + IPage page = entrustServiceOrderDao.pageOrderByMatchmaker(pageUtil.toPageWithoutOrders(), queryParams); + if (page.getSize() > 0) { + page.getRecords().forEach(record -> { + record.setInitiatorMiInfo(marriageInformationQueryService.queryVo(record.getInitiatorMiId())); + record.setTargetMiInfo(marriageInformationQueryService.queryVo(record.getTargetMiId())); + }); + } + return page; } } \ No newline at end of file diff --git a/dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml b/dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml index 71b3c64..7fd1710 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml @@ -31,4 +31,35 @@ ORDER BY daeso.create_time desc + +