dating-agency
/
dating-agency-mall
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

委托服务费用

master
张彭杰 3 weeks ago
parent
273f8b2d2a
commit
e4ed2c1eb1
7 changed files with 138 additions and 5 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/EntrustServiceOrderUserQueryController.java
  2. 21
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/request/PageEntrustServiceOrderByMatchmakerQueryParams.java
  3. 4
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderByInitiatorVo.java
  4. 77
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderByMatchmakerVo.java
  5. 15
      dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/EntrustServiceOrderQueryService.java
  6. 12
      dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java
  7. 1
      dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml

13
dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/EntrustServiceOrderUserQueryController.java
View File

@ -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<UserPageEntrustServiceOrderByMatchmakerVo> userPageOrderByMatchmaker(PageUtil pageUtil,
@Validated PageEntrustServiceOrderByMatchmakerQueryParams queryParams,
@RequestParam("userId") Long userId) {
return PageUtil.convert(entrustServiceOrderQueryService.pageOrderByMatchmaker(pageUtil, queryParams), UserPageEntrustServiceOrderByMatchmakerVo.class);
}
}

21
dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/request/PageEntrustServiceOrderByMatchmakerQueryParams.java
View File

@ -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;
}

4
dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderByInitiatorVo.java
View File

@ -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;

77
dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/eso/user/response/UserPageEntrustServiceOrderByMatchmakerVo.java
View File

@ -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;
}

15
dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/EntrustServiceOrderQueryService.java
View File

@ -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<UserPageEntrustServiceOrderByInitiatorVo> userPageOrderByInitiator(PageUtil pageUtil,
PageEntrustServiceOrderByInitiatorQueryParams queryParams);
IPage<UserPageEntrustServiceOrderByInitiatorVo> pageOrderByInitiator(PageUtil pageUtil,
PageEntrustServiceOrderByInitiatorQueryParams queryParams);
/**
* 分页查询按红娘排序的委托服务列表
*
* @param pageUtil 分页工具类，包含分页参数信息
* @param queryParams 按红娘排序的委托服务查询参数，包含查询条件
* @return 返回分页结果对象，包含查询到的数据列表及分页信息
*/
IPage<UserPageEntrustServiceOrderByMatchmakerVo> pageOrderByMatchmaker(PageUtil pageUtil, PageEntrustServiceOrderByMatchmakerQueryParams queryParams);
}

12
dating-agency-mall-server/src/main/java/com/qniao/dam/query/eso/impl/EntrustServiceOrderQueryServiceImpl.java
View File

@ -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<UserPageEntrustServiceOrderByInitiatorVo> userPageOrderByInitiator(PageUtil pageUtil,
PageEntrustServiceOrderByInitiatorQueryParams queryParams) {
public IPage<UserPageEntrustServiceOrderByInitiatorVo> pageOrderByInitiator(PageUtil pageUtil,
PageEntrustServiceOrderByInitiatorQueryParams queryParams) {
IPage<UserPageEntrustServiceOrderByInitiatorVo> 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<UserPageEntrustServiceOrderByMatchmakerVo> pageOrderByMatchmaker(PageUtil pageUtil,
PageEntrustServiceOrderByMatchmakerQueryParams queryParams) {
return null;
}
}

1
dating-agency-mall-server/src/main/resources/mapper/eso/EntrustServiceOrderDao.xml
View File

@ -5,6 +5,7 @@
<select id="pageOrderByInitiator"
resultType="com.qniao.dam.api.query.eso.user.response.UserPageEntrustServiceOrderByInitiatorVo">
SELECT
daeso.id,
daeso.target_user_id,
daeso.target_mi_id,
daeso.matchmaker_id,

Write Preview
Loading…
Cancel
Save