From 029f5eb15011e5e025e71aeac97cd4cc41d6e904 Mon Sep 17 00:00:00 2001 From: Derran Date: Thu, 6 Mar 2025 10:45:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E6=94=B6=E7=9B=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/response/UseGetRevenueRewardAbstractVo.java | 11 +++++++++++ .../mapper/revenuereward/RevenueRewardViewMapper.xml | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UseGetRevenueRewardAbstractVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UseGetRevenueRewardAbstractVo.java index 042834c..0ff7fcd 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UseGetRevenueRewardAbstractVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UseGetRevenueRewardAbstractVo.java @@ -17,7 +17,18 @@ public class UseGetRevenueRewardAbstractVo { @ApiModelProperty("营收额") private BigDecimal totalRevenue = BigDecimal.ZERO; + @ApiModelProperty("线上营收额") + private BigDecimal onlineRevenue = BigDecimal.ZERO; + + @ApiModelProperty("线下营收额") + private BigDecimal offlineRevenue = BigDecimal.ZERO; + @ApiModelProperty("收益额") private BigDecimal totalEarnings = BigDecimal.ZERO; + @ApiModelProperty("线上收益额") + private BigDecimal onlineEarnings = BigDecimal.ZERO; + + @ApiModelProperty("线下收益额") + private BigDecimal offlineEarnings = BigDecimal.ZERO; } 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 a7643c8..b389ca0 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 @@ -8,7 +8,11 @@ select drr.id, SUM(drrr.revenue) as totalRevenue, - SUM(drrr.earnings) as totalEarnings + SUM(IF(drrr.trade_scene=1,drrr.revenue,0)) as onlineRevenue, + SUM(IF(drrr.trade_scene=2,drrr.revenue,0)) as offlineRevenue, + SUM(drrr.earnings) as totalEarnings, + SUM(IF(drrr.trade_scene=1,drrr.earnings,0)) as onlineEarnings, + SUM(IF(drrr.trade_scene=2,drrr.earnings,0)) as offlineEarnings from da_revenue_reward_record as drrr LEFT JOIN da_revenue_reward as drr on drr.id=drrr.revenue_reward_id WHERE drr.is_delete=0