diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UsePageRevenueRewardRecordByOperatorQueryParams.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UsePageRevenueRewardRecordByOperatorQueryParams.java index e4eed18..7f74206 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UsePageRevenueRewardRecordByOperatorQueryParams.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/request/UsePageRevenueRewardRecordByOperatorQueryParams.java @@ -15,6 +15,12 @@ public class UsePageRevenueRewardRecordByOperatorQueryParams { @ApiModelProperty("收益者手机") private String revenueOwnerPhone; + @ApiModelProperty("站点名称") + private String storeName; + + @ApiModelProperty("区域代理名称") + private String operationCenterName; + @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 d3f2151..8e22c3a 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 @@ -85,6 +85,12 @@ AND dam.phone LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerPhone}), '%') + + AND dao1.full_name LIKE CONCAT('%', TRIM(#{queryParams.storeName}), '%') + + + AND dao2.full_name LIKE CONCAT('%', TRIM(#{queryParams.operationCenterName}), '%') + and darrr.create_time BETWEEN #{queryParams.createTimeFrom} and #{queryParams.createTimeTo} @@ -129,6 +135,12 @@ AND dam.phone LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerPhone}), '%') + + AND dao1.full_name LIKE CONCAT('%', TRIM(#{queryParams.storeName}), '%') + + + AND dao2.full_name LIKE CONCAT('%', TRIM(#{queryParams.operationCenterName}), '%') + and darrr.create_time BETWEEN #{queryParams.createTimeFrom} and #{queryParams.createTimeTo}