From d31ad6d01c90f834b1e10e4da4af1407851aba74 Mon Sep 17 00:00:00 2001 From: Derran Date: Mon, 2 Dec 2024 17:11:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E5=A8=98=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RevenueRewardUserQueryController.java | 7 +++++++ ...eGetRevenueRewardAbstractByOperatorVo.java | 16 +++++++++++++++ .../dao/view/RevenueRewardViewDao.java | 7 +++---- .../RevenueRewardQueryService.java | 3 +++ .../impl/RevenueRewardQueryServiceImpl.java | 10 ++++++---- .../revenuereward/RevenueRewardViewMapper.xml | 20 +++++++++++++++++++ 6 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UseGetRevenueRewardAbstractByOperatorVo.java 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 0acdf61..ea4151f 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 @@ -3,6 +3,7 @@ package com.qniao.dam.api.query.revenuereward.user; import com.qniao.dam.api.query.revenuereward.user.request.UseGetRevenueRewardAbstractQueryParams; import com.qniao.dam.api.query.revenuereward.user.request.UsePageRevenueRewardRecordByOperatorQueryParams; import com.qniao.dam.api.query.revenuereward.user.request.UsePageRevenueRewardRecordQueryParams; +import com.qniao.dam.api.query.revenuereward.user.response.UseGetRevenueRewardAbstractByOperatorVo; import com.qniao.dam.api.query.revenuereward.user.response.UseGetRevenueRewardAbstractVo; import com.qniao.dam.api.query.revenuereward.user.response.UseGetRevenueRewardRecordVo; import com.qniao.dam.api.query.revenuereward.user.response.UsePageRevenueRewardRecordByOperatorVo; @@ -63,4 +64,10 @@ public class RevenueRewardUserQueryController { return PageUtil.convert(revenueRewardQueryService.pageRevenueRewardRecordByOperator(pageUtil, queryParams), UsePageRevenueRewardRecordByOperatorVo.class); } + + @GetMapping("get/revenue-reward-abstract/by/operator") + @ApiOperation("运营端获取用户收益记录摘要") + public UseGetRevenueRewardAbstractByOperatorVo useGetRevenueRewardAbstractByOperator(UsePageRevenueRewardRecordByOperatorQueryParams queryParams) { + return revenueRewardQueryService.getRevenueRewardAbstractByOperator(queryParams); + } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UseGetRevenueRewardAbstractByOperatorVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UseGetRevenueRewardAbstractByOperatorVo.java new file mode 100644 index 0000000..835c952 --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UseGetRevenueRewardAbstractByOperatorVo.java @@ -0,0 +1,16 @@ +package com.qniao.dam.api.query.revenuereward.user.response; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class UseGetRevenueRewardAbstractByOperatorVo { + + @ApiModelProperty("总营收金额") + private BigDecimal totalRevenue; + + @ApiModelProperty("总实收金额") + private BigDecimal totalEarnings; +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/RevenueRewardViewDao.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/RevenueRewardViewDao.java index f51f769..7543f92 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/RevenueRewardViewDao.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/RevenueRewardViewDao.java @@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.qniao.dam.api.query.revenuereward.user.request.UseGetRevenueRewardAbstractQueryParams; import com.qniao.dam.api.query.revenuereward.user.request.UsePageRevenueRewardRecordByOperatorQueryParams; import com.qniao.dam.api.query.revenuereward.user.request.UsePageRevenueRewardRecordQueryParams; -import com.qniao.dam.api.query.revenuereward.user.response.RevenueRewardAssociateOrderRecordVo; -import com.qniao.dam.api.query.revenuereward.user.response.UseGetRevenueRewardAbstractVo; -import com.qniao.dam.api.query.revenuereward.user.response.UseGetRevenueRewardRecordVo; -import com.qniao.dam.api.query.revenuereward.user.response.UsePageRevenueRewardRecordByOperatorVo; +import com.qniao.dam.api.query.revenuereward.user.response.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,4 +22,6 @@ public interface RevenueRewardViewDao { @Param("queryParams") UsePageRevenueRewardRecordByOperatorQueryParams queryParams); List listAssociateOrderRecord(@Param("revenueRewardRecordIdList") List revenueRewardRecordIdList); + + UseGetRevenueRewardAbstractByOperatorVo getRevenueRewardAbstractByOperator(@Param("queryParams") UsePageRevenueRewardRecordByOperatorQueryParams queryParams); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/RevenueRewardQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/RevenueRewardQueryService.java index 39a743d..1d6b9bf 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/RevenueRewardQueryService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/RevenueRewardQueryService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.qniao.dam.api.query.revenuereward.user.request.UseGetRevenueRewardAbstractQueryParams; import com.qniao.dam.api.query.revenuereward.user.request.UsePageRevenueRewardRecordByOperatorQueryParams; import com.qniao.dam.api.query.revenuereward.user.request.UsePageRevenueRewardRecordQueryParams; +import com.qniao.dam.api.query.revenuereward.user.response.UseGetRevenueRewardAbstractByOperatorVo; import com.qniao.dam.api.query.revenuereward.user.response.UseGetRevenueRewardAbstractVo; import com.qniao.dam.api.query.revenuereward.user.response.UseGetRevenueRewardRecordVo; import com.qniao.dam.api.query.revenuereward.user.response.UsePageRevenueRewardRecordByOperatorVo; @@ -23,4 +24,6 @@ public interface RevenueRewardQueryService { RevenueReward queryByType(Long identityId, IdentityTypeEnum identityType); IPage pageRevenueRewardRecordByOperator(PageUtil pageUtil, UsePageRevenueRewardRecordByOperatorQueryParams queryParams); + + UseGetRevenueRewardAbstractByOperatorVo getRevenueRewardAbstractByOperator(UsePageRevenueRewardRecordByOperatorQueryParams queryParams); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/impl/RevenueRewardQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/impl/RevenueRewardQueryServiceImpl.java index 6289901..23e7811 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/impl/RevenueRewardQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/revenuereward/impl/RevenueRewardQueryServiceImpl.java @@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.qniao.dam.api.query.revenuereward.user.request.UseGetRevenueRewardAbstractQueryParams; import com.qniao.dam.api.query.revenuereward.user.request.UsePageRevenueRewardRecordByOperatorQueryParams; import com.qniao.dam.api.query.revenuereward.user.request.UsePageRevenueRewardRecordQueryParams; -import com.qniao.dam.api.query.revenuereward.user.response.RevenueRewardAssociateOrderRecordVo; -import com.qniao.dam.api.query.revenuereward.user.response.UseGetRevenueRewardAbstractVo; -import com.qniao.dam.api.query.revenuereward.user.response.UseGetRevenueRewardRecordVo; -import com.qniao.dam.api.query.revenuereward.user.response.UsePageRevenueRewardRecordByOperatorVo; +import com.qniao.dam.api.query.revenuereward.user.response.*; import com.qniao.dam.domain.aggregate.revenuereward.entity.RevenueReward; import com.qniao.dam.domian.aggregate.walletaccount.constant.IdentityTypeEnum; import com.qniao.dam.infrastructure.persistent.dao.domain.RevenueRewardDao; @@ -87,6 +84,11 @@ public class RevenueRewardQueryServiceImpl implements RevenueRewardQueryService return page; } + @Override + public UseGetRevenueRewardAbstractByOperatorVo getRevenueRewardAbstractByOperator(UsePageRevenueRewardRecordByOperatorQueryParams queryParams) { + return revenueRewardViewDao.getRevenueRewardAbstractByOperator(queryParams); + } + @Override public UseGetRevenueRewardAbstractVo getRevenueRewardAbstract(UseGetRevenueRewardAbstractQueryParams queryParams) { return revenueRewardViewDao.getRevenueRewardAbstract(queryParams); diff --git a/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml index f57b017..6341bb8 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/revenuereward/RevenueRewardViewMapper.xml @@ -106,4 +106,24 @@ #{revenueRewardRecordId} + +