diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UserPageRevenueRewardRecordByOperatorQueryParams.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UserPageRevenueRewardRecordByOperatorQueryParams.java index 0cdc4d5..9446217 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UserPageRevenueRewardRecordByOperatorQueryParams.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UserPageRevenueRewardRecordByOperatorQueryParams.java @@ -1,5 +1,6 @@ package com.qniao.dam.api.query.revenuereward.user.request; +import com.qniao.dam.domian.aggregate.walletaccount.constant.IdentityTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -24,6 +25,9 @@ public class UserPageRevenueRewardRecordByOperatorQueryParams { @ApiModelProperty("区域代理名称") private String operationCenterName; + @ApiModelProperty("身份类型(1个人、2服务商)") + private Integer identityType; + @ApiModelProperty("创建开始时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeFrom; 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 060a2e1..961c201 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 @@ -90,6 +90,9 @@ and darrr.trade_scene = #{queryParams.tradeScene} + + and darr.identity_type = #{queryParams.identityType} + AND (dam.`name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%') or dao3.`full_name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%')) @@ -149,6 +152,9 @@ and darrr.trade_scene = #{queryParams.tradeScene} + + and darr.identity_type = #{queryParams.identityType} + AND (dam.`name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%') or dao3.`full_name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%'))