From bb16b9b7127dbb37cb5deceb45d0337ec598f897 Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Wed, 2 Apr 2025 16:15:05 +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

---
 .../UserPageRevenueRewardRecordByOperatorQueryParams.java   | 4 ++++
 .../mapper/revenuereward/RevenueRewardViewMapper.xml        | 6 ++++++
 2 files changed, 10 insertions(+)

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 @@
         <if test="queryParams.tradeScene != null">
             and darrr.trade_scene = #{queryParams.tradeScene}
         </if>
+        <if test="queryParams.identityType != null">
+            and darr.identity_type = #{queryParams.identityType}
+        </if>
         <if test="queryParams.revenueOwnerName != null and queryParams.revenueOwnerName != '' ">
             AND (dam.`name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%') or
             dao3.`full_name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%'))
@@ -149,6 +152,9 @@
         <if test="queryParams.tradeScene != null">
             and darrr.trade_scene = #{queryParams.tradeScene}
         </if>
+        <if test="queryParams.identityType != null">
+            and darr.identity_type = #{queryParams.identityType}
+        </if>
         <if test="queryParams.revenueOwnerName != null and queryParams.revenueOwnerName != '' ">
             AND (dam.`name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%') or
             dao3.`full_name` LIKE CONCAT('%', TRIM(#{queryParams.revenueOwnerName}), '%'))