diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java index 42374e2..222c49b 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java @@ -1,10 +1,7 @@ package com.qniao.dam.api.query.revenuereward.user; import com.qniao.dam.api.command.revenuereward.user.response.UserGetRevenueRewardRecordByOperatorVo; -import com.qniao.dam.api.query.revenuereward.user.request.UseGetRevenueRewardAbstractQueryParams; -import com.qniao.dam.api.query.revenuereward.user.request.UserListMatchmakerRevenueRewardStatisticsQueryParams; -import com.qniao.dam.api.query.revenuereward.user.request.UserPageRevenueRewardRecordByOperatorQueryParams; -import com.qniao.dam.api.query.revenuereward.user.request.UsePageRevenueRewardRecordQueryParams; +import com.qniao.dam.api.query.revenuereward.user.request.*; import com.qniao.dam.api.query.revenuereward.user.response.*; import com.qniao.dam.query.revenuereward.RevenueRewardQueryService; import com.qniao.dau.infrastructure.constant.RequestHeaderFields; @@ -91,11 +88,13 @@ public class RevenueRewardUserQueryController { return revenueRewardQueryService.listMatchmakerRevenueRewardStatistics(queryParams); } - @GetMapping("list/matchmaker-revenue-reward-record") + @GetMapping("page/matchmaker-revenue-reward-record") @ApiOperation("获取红娘收益数据记录") - public List userListMatchmakerRevenueRewardRecord(UserListMatchmakerRevenueRewardStatisticsQueryParams queryParams, - @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId) { + public QnPage userPageMatchmakerRevenueRewardRecord(PageUtil pageUtil, + UserListMatchmakerRevenueRewardRecordQueryParams queryParams, + @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId) { queryParams.setQueryOrgId(orgId); - return revenueRewardQueryService.listMatchmakerRevenueRewardStatistics(queryParams); + //return PageUtil.convert(revenueRewardQueryService.pageMatchmakerRevenueRewardRecord(pageUtil, queryParams), UserPageMatchmakerRevenueRewardRecordVo.class); + return null; } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UserListMatchmakerRevenueRewardRecordQueryParams.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UserListMatchmakerRevenueRewardRecordQueryParams.java new file mode 100644 index 0000000..53d0a6b --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UserListMatchmakerRevenueRewardRecordQueryParams.java @@ -0,0 +1,34 @@ +package com.qniao.dam.api.query.revenuereward.user.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +@Data +public class UserListMatchmakerRevenueRewardRecordQueryParams { + + @ApiModelProperty("查询组织标识") + private Long queryOrgId; + + @ApiModelProperty("红娘标识") + private Long matchmakerId; + + @ApiModelProperty("所属门店") + private Long storeId; + + @ApiModelProperty("收益开始时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime revenueTimeFrom; + + @ApiModelProperty("收益结束时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime revenueTimeTo; + + @ApiModelProperty("服务用户信息 昵称、手机号") + private String serviceUserInfo; + + @ApiModelProperty("业务类型") + private Integer tradeType; +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UserPageMatchmakerRevenueRewardRecordVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UserPageMatchmakerRevenueRewardRecordVo.java new file mode 100644 index 0000000..2b95616 --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UserPageMatchmakerRevenueRewardRecordVo.java @@ -0,0 +1,67 @@ +package com.qniao.dam.api.query.revenuereward.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.domian.aggregate.product.constant.ProductSubCategoryEnum; +import com.qniao.dam.domian.aggregate.walletaccount.constant.TradeTypeEnum; +import com.qniao.dau.domian.aggregate.matchmaker.constant.MatchmakerLevelEnum; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +public class UserPageMatchmakerRevenueRewardRecordVo { + + @ApiModelProperty("收益者名称") + private String revenueOwnerName; + + @ApiModelProperty("红娘用户ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long matchmakerUserId; + + @ApiModelProperty("所属门店") + private String storeName; + + @ApiModelProperty("红娘身份类型") + private ProductSubCategoryEnum matchmakerType; + + @ApiModelProperty("红娘等级") + private MatchmakerLevelEnum matchmakerLevel; + + @ApiModelProperty("交易类型") + private TradeTypeEnum tradeType; + + @ApiModelProperty("营收额") + private BigDecimal revenue; + + @ApiModelProperty("营收额百分比") + private BigDecimal revenuePct; + + @ApiModelProperty("服务费百分比") + private BigDecimal servicePct; + + @ApiModelProperty("收益额 营收额除去平台服务费") + private BigDecimal earnings; + + @ApiModelProperty("订单金额") + private BigDecimal totalAssociateOrderAmount; + + @ApiModelProperty("服务用户名称") + private String serviceUserName; + + @ApiModelProperty("服务用户手机") + private String serviceUserPhone; + + @ApiModelProperty("内容") + private String content; + + @ApiModelProperty("凭证Url") + private String proofUrl; + + @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; +}