From 7decccceab121237c0ec328fb1373408180ff94c Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Fri, 9 May 2025 10:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E6=B6=88=E8=B4=B9=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/account/domain/param/AccConsumeDetailQueryParam.java  | 1 +
 .../src/main/resources/mapper/account/AccTradeMapper.xml       | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccConsumeDetailQueryParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccConsumeDetailQueryParam.java
index d04236c..447d59f 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccConsumeDetailQueryParam.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccConsumeDetailQueryParam.java
@@ -21,6 +21,7 @@ public class AccConsumeDetailQueryParam extends BaseEntity {
    @ApiModelProperty("交易类型")
    private Integer tradeType;
    private Integer walletId;
+   private Integer userType;
    private String searchValue;
    public AccConsumeDetailQueryParam() {
       this.endDateTime = LocalDateTime.now().plusDays(7);
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
index f296a98..c9ca8dd 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
@@ -328,6 +328,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="param.walletId != null">
             and atwd.wallet_id = #{param.walletId}
         </if>
+        <if test="param.userType != null">
+            and su.user_type = #{param.userType}
+        </if>
         <if test="param.deptIdList != null and param.deptIdList.size() > 0">
             and sd.dept_id in
             <foreach collection="param.deptIdList" item="deptId" separator="," open="(" close=")">