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 cc81f51..42374e2 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 @@ -84,11 +84,18 @@ public class RevenueRewardUserQueryController { } @GetMapping("list/matchmaker-revenue-reward-statistics") - @ApiOperation("获取红娘收益数据记录") + @ApiOperation("获取红娘收益数据统计") public List userListMatchmakerRevenueRewardStatistics(UserListMatchmakerRevenueRewardStatisticsQueryParams queryParams, - @RequestParam("userId") Long userId, @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId) { queryParams.setQueryOrgId(orgId); return revenueRewardQueryService.listMatchmakerRevenueRewardStatistics(queryParams); } + + @GetMapping("list/matchmaker-revenue-reward-record") + @ApiOperation("获取红娘收益数据记录") + public List userListMatchmakerRevenueRewardRecord(UserListMatchmakerRevenueRewardStatisticsQueryParams queryParams, + @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId) { + queryParams.setQueryOrgId(orgId); + return revenueRewardQueryService.listMatchmakerRevenueRewardStatistics(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 6c91300..e40171e 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 @@ -108,20 +108,21 @@ select - SUM(IFNULL(darrr.revenue,0)) as totalRevenue, - SUM(IFNULL(darrr.earnings,0)) as totalEarnings + SUM(IFNULL(darrr.revenue,0)) as totalRevenue, + SUM(IFNULL(darrr.earnings,0)) as totalEarnings from da_revenue_reward as darr - LEFT JOIN da_revenue_reward_record as darrr on darrr.revenue_reward_id=darr.id - LEFT JOIN da_matchmaker as dam on dam.is_delete=0 and dam.user_id=darr.user_id - LEFT JOIN da_store as das on dam.store_id=das.id - LEFT JOIN da_organization dao1 on dao1.id= das.org_id - LEFT JOIN da_organization dao2 on dao2.id= das.operation_center_org_id + LEFT JOIN da_revenue_reward_record as darrr on darrr.revenue_reward_id=darr.id + LEFT JOIN da_matchmaker as dam on dam.is_delete=0 and dam.user_id=darr.user_id + LEFT JOIN da_store as das on dam.store_id=das.id + LEFT JOIN da_organization dao1 on dao1.id= das.org_id + LEFT JOIN da_organization dao2 on dao2.id= das.operation_center_org_id where darr.is_delete=0 and darr.identity_type=1 and darrr.trade_scene = #{queryParams.tradeScene} @@ -163,16 +164,24 @@