diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UsePageRevenueRewardRecordByOperatorVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UsePageRevenueRewardRecordByOperatorVo.java index cc2566f..2e6150c 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UsePageRevenueRewardRecordByOperatorVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/response/UsePageRevenueRewardRecordByOperatorVo.java @@ -39,6 +39,12 @@ public class UsePageRevenueRewardRecordByOperatorVo { @ApiModelProperty("红娘等级") private MatchmakerLevelEnum matchmakerLevel; + @ApiModelProperty("站点名称") + private String storeName; + + @ApiModelProperty("区域代理名称") + private String operationCenterName; + @ApiModelProperty("交易类型") private TradeTypeEnum tradeType; 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 ace3627..d3f2151 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 @@ -69,10 +69,15 @@ darrr.revenue_pct, darrr.revenue, darrr.service_pct, - darrr.earnings + darrr.earnings, + dao1.full_name as storeName, + dao2.full_name as operationCenterName from da_revenue_reward_record as darrr INNER JOIN da_revenue_reward as darr 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 dam.`name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%')