diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/EntrustServiceOrderUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/EntrustServiceOrderUserQueryController.java index e0f408b..e694a9e 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/EntrustServiceOrderUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/EntrustServiceOrderUserQueryController.java @@ -5,6 +5,7 @@ import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderByMatchma import com.qniao.dam.api.query.eso.user.request.PageEntrustServiceOrderQueryParams; import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByInitiatorVo; import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByMatchmakerVo; +import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderVo; import com.qniao.dam.query.eso.EntrustServiceOrderQueryService; import com.qniao.domain.QnPage; import com.qniao.framework.utils.PageUtil; @@ -42,9 +43,9 @@ public class EntrustServiceOrderUserQueryController { @GetMapping("page/entrust-service-order") @ApiOperation("用户获取委托服务单列表") - public QnPage userPageEntrustServiceOrder(PageUtil pageUtil, - PageEntrustServiceOrderQueryParams queryParams) { - return null; + public QnPage userPageEntrustServiceOrder(PageUtil pageUtil, + PageEntrustServiceOrderQueryParams queryParams) { + return PageUtil.convert(entrustServiceOrderQueryService.pageOrder(pageUtil, queryParams), UserPageEntrustServiceOrderVo.class); } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderVo.java new file mode 100644 index 0000000..a8e58df --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderVo.java @@ -0,0 +1,75 @@ +package com.qniao.dam.api.query.eso.user.response; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.qniao.dam.api.query.marriageinformation.response.MarriageInformationVo; +import com.qniao.dam.domian.aggregate.eso.constant.EntrustServicePaymentStatusEnum; +import com.qniao.dam.domian.aggregate.eso.constant.EntrustServiceStatusEnum; +import com.qniao.dam.domian.aggregate.eso.constant.EntrustServiceTypeEnum; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +public class UserPageEntrustServiceOrderVo { + + @ApiModelProperty("唯一标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + @ApiModelProperty("发起人用户标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long initiatorUserId; + + @ApiModelProperty("发起人资料标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long initiatorMiId; + + @ApiModelProperty("发起人资料信息") + private MarriageInformationVo initiatorMiInfo; + + @ApiModelProperty("目标用户标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long targetUserId; + + @ApiModelProperty("目标资料标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long targetMiId; + + @ApiModelProperty("目标资料信息") + private MarriageInformationVo targetMiInfo; + + @ApiModelProperty("红娘标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long matchmakerId; + + @ApiModelProperty("委托服务类型") + private EntrustServiceTypeEnum type; + + @ApiModelProperty("奖励金额") + private BigDecimal rewardAmount; + + @ApiModelProperty("关联订单ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long associateOrderId; + + @ApiModelProperty("关联订单号") + private String associateOrderCode; + + @ApiModelProperty("付款金额") + private BigDecimal paidAmount; + + @ApiModelProperty("状态") + private EntrustServiceStatusEnum status; + + @ApiModelProperty("付款状态") + private EntrustServicePaymentStatusEnum paymentStatus; + + @ApiModelProperty("下单时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + +} 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 258a413..affe961 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 @@ -5,8 +5,10 @@ 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.request.PageEntrustServiceOrderQueryParams; import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByInitiatorVo; import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByMatchmakerVo; +import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderVo; import com.qniao.dam.domain.aggregate.eso.entity.EntrustServiceOrder; import org.apache.ibatis.annotations.Param; @@ -21,4 +23,7 @@ public interface EntrustServiceOrderDao extends BaseMapper IPage pageOrderByMatchmaker(Page pageWithoutOrders, @Param("queryParams") PageEntrustServiceOrderByMatchmakerQueryParams queryParams); + + IPage pageOrder(Page pageWithoutOrders, + @Param("queryParams") PageEntrustServiceOrderQueryParams queryParams); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/EntrustServiceOrderQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/EntrustServiceOrderQueryService.java index e57205e..f0faf4f 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/EntrustServiceOrderQueryService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/EntrustServiceOrderQueryService.java @@ -3,8 +3,10 @@ package com.qniao.dam.query.eso; import com.baomidou.mybatisplus.core.metadata.IPage; 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.request.PageEntrustServiceOrderQueryParams; import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByInitiatorVo; import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByMatchmakerVo; +import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderVo; import com.qniao.dam.domain.aggregate.eso.entity.EntrustServiceOrder; import com.qniao.domain.QnPage; import com.qniao.framework.utils.PageUtil; @@ -26,4 +28,6 @@ public interface EntrustServiceOrderQueryService { */ IPage pageOrderByMatchmaker(PageUtil pageUtil, PageEntrustServiceOrderByMatchmakerQueryParams queryParams); + + IPage pageOrder(PageUtil pageUtil, PageEntrustServiceOrderQueryParams 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 d569dc3..c2d9183 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 @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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.request.PageEntrustServiceOrderQueryParams; import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByInitiatorVo; import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByMatchmakerVo; +import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderVo; import com.qniao.dam.domain.aggregate.eso.entity.EntrustServiceOrder; import com.qniao.dam.domian.aggregate.eso.constant.EntrustServiceStatusEnum; import com.qniao.dam.infrastructure.persistent.dao.eso.EntrustServiceOrderDao; @@ -67,4 +69,17 @@ public class EntrustServiceOrderQueryServiceImpl implements EntrustServiceOrderQ } return page; } + + @Override + public IPage pageOrder(PageUtil pageUtil, + PageEntrustServiceOrderQueryParams queryParams) { + IPage page = entrustServiceOrderDao.pageOrder(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 01b23c3..6cdaaf3 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 @@ -62,4 +62,39 @@ ORDER BY daeso.create_time desc + +