From e4ed2c1eb1260551474ea21fe5d40aeca72007b4 Mon Sep 17 00:00:00 2001 From: Derran Date: Mon, 9 Mar 2026 18:19:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E6=9C=8D=E5=8A=A1=E8=B4=B9?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ntrustServiceOrderUserQueryController.java | 13 +++- ...stServiceOrderByMatchmakerQueryParams.java | 21 +++++ ...rPageEntrustServiceOrderByInitiatorVo.java | 4 + ...PageEntrustServiceOrderByMatchmakerVo.java | 77 +++++++++++++++++++ .../eso/EntrustServiceOrderQueryService.java | 15 +++- .../EntrustServiceOrderQueryServiceImpl.java | 12 ++- .../mapper/eso/EntrustServiceOrderDao.xml | 1 + 7 files changed, 138 insertions(+), 5 deletions(-) create mode 100644 dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/request/PageEntrustServiceOrderByMatchmakerQueryParams.java create mode 100644 dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderByMatchmakerVo.java 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 9489eca..2c35d39 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 @@ -1,12 +1,15 @@ package com.qniao.dam.api.query.eso.user; 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.query.eso.EntrustServiceOrderQueryService; import com.qniao.domain.QnPage; import com.qniao.framework.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -25,7 +28,15 @@ public class EntrustServiceOrderUserQueryController { PageEntrustServiceOrderByInitiatorQueryParams queryParams, @RequestParam("userId") Long userId) { queryParams.setQueryInitiatorUserId(userId); - return PageUtil.convert(entrustServiceOrderQueryService.userPageOrderByInitiator(pageUtil, queryParams), UserPageEntrustServiceOrderByInitiatorVo.class); + return PageUtil.convert(entrustServiceOrderQueryService.pageOrderByInitiator(pageUtil, queryParams), UserPageEntrustServiceOrderByInitiatorVo.class); + } + + @GetMapping("page/entrust-service-order/by/matchmaker") + @ApiOperation("红娘获取委托服务单列表") + public QnPage userPageOrderByMatchmaker(PageUtil pageUtil, + @Validated PageEntrustServiceOrderByMatchmakerQueryParams queryParams, + @RequestParam("userId") Long userId) { + return PageUtil.convert(entrustServiceOrderQueryService.pageOrderByMatchmaker(pageUtil, queryParams), UserPageEntrustServiceOrderByMatchmakerVo.class); } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/request/PageEntrustServiceOrderByMatchmakerQueryParams.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/request/PageEntrustServiceOrderByMatchmakerQueryParams.java new file mode 100644 index 0000000..02603e8 --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/request/PageEntrustServiceOrderByMatchmakerQueryParams.java @@ -0,0 +1,21 @@ +package com.qniao.dam.api.query.eso.user.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class PageEntrustServiceOrderByMatchmakerQueryParams { + + @ApiModelProperty("红娘标识") + @NotNull(message = "红娘标识不能为空") + private Long queryMatchmakerId; + + @ApiModelProperty("状态") + private Integer status; + + @ApiModelProperty("付款状态") + private Integer paymentStatus; + +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderByInitiatorVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderByInitiatorVo.java index d3a621e..7fd0d8a 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderByInitiatorVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderByInitiatorVo.java @@ -16,6 +16,10 @@ import java.time.LocalDateTime; @Data public class UserPageEntrustServiceOrderByInitiatorVo { + @ApiModelProperty("唯一标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + @ApiModelProperty("目标用户标识") @JsonSerialize(using = ToStringSerializer.class) private Long targetUserId; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderByMatchmakerVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderByMatchmakerVo.java new file mode 100644 index 0000000..4681d8f --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderByMatchmakerVo.java @@ -0,0 +1,77 @@ +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 UserPageEntrustServiceOrderByMatchmakerVo { + + @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("发起人资料信息") + @JsonSerialize(using = ToStringSerializer.class) + private MarriageInformationVo initiatorMiInfo; + + @ApiModelProperty("目标用户标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long targetUserId; + + @ApiModelProperty("目标资料标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long targetMiId; + + @ApiModelProperty("目标资料信息") + @JsonSerialize(using = ToStringSerializer.class) + 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/query/eso/EntrustServiceOrderQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/EntrustServiceOrderQueryService.java index a57c3b6..e57205e 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 @@ -2,7 +2,9 @@ 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.response.UserPageEntrustServiceOrderByInitiatorVo; +import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByMatchmakerVo; import com.qniao.dam.domain.aggregate.eso.entity.EntrustServiceOrder; import com.qniao.domain.QnPage; import com.qniao.framework.utils.PageUtil; @@ -13,6 +15,15 @@ public interface EntrustServiceOrderQueryService { EntrustServiceOrder queryByAssociateOrderId(Long associateOrderId); - IPage userPageOrderByInitiator(PageUtil pageUtil, - PageEntrustServiceOrderByInitiatorQueryParams queryParams); + IPage pageOrderByInitiator(PageUtil pageUtil, + PageEntrustServiceOrderByInitiatorQueryParams queryParams); +/** + * 分页查询按红娘排序的委托服务列表 + * + * @param pageUtil 分页工具类，包含分页参数信息 + * @param queryParams 按红娘排序的委托服务查询参数，包含查询条件 + * @return 返回分页结果对象，包含查询到的数据列表及分页信息 + */ + + IPage pageOrderByMatchmaker(PageUtil pageUtil, 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 b030603..3659c5c 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 @@ -3,7 +3,9 @@ package com.qniao.dam.query.eso.impl; 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.response.UserPageEntrustServiceOrderByInitiatorVo; +import com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByMatchmakerVo; 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; @@ -42,8 +44,8 @@ public class EntrustServiceOrderQueryServiceImpl implements EntrustServiceOrderQ } @Override - public IPage userPageOrderByInitiator(PageUtil pageUtil, - PageEntrustServiceOrderByInitiatorQueryParams queryParams) { + public IPage pageOrderByInitiator(PageUtil pageUtil, + PageEntrustServiceOrderByInitiatorQueryParams queryParams) { IPage page = entrustServiceOrderDao.pageOrderByInitiator(pageUtil.toPageWithoutOrders(), queryParams); if (page.getSize() > 0) { page.getRecords().forEach(record -> { @@ -52,4 +54,10 @@ public class EntrustServiceOrderQueryServiceImpl implements EntrustServiceOrderQ } return page; } + + @Override + public IPage pageOrderByMatchmaker(PageUtil pageUtil, + PageEntrustServiceOrderByMatchmakerQueryParams queryParams) { + return null; + } } \ 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 85f5b13..71b3c64 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 @@ -5,6 +5,7 @@