From e99880855121f909a4d00685a0eda94c1e89a0d1 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Thu, 24 Apr 2025 11:04:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/domain/param/AccWalletOperationQueryParam.java | 1 + .../src/main/resources/mapper/account/AccTradeMapper.xml | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccWalletOperationQueryParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccWalletOperationQueryParam.java index 0e26c2b..b3d9b52 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccWalletOperationQueryParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccWalletOperationQueryParam.java @@ -21,6 +21,7 @@ public class AccWalletOperationQueryParam extends BaseEntity { private LocalDateTime endDateTime; @ApiModelProperty("交易类型") private Integer tradeType; + private Integer payState; private String searchValue; private String createBy; private Long userId; 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 906fa4f..3bdfd42 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 @@ -242,7 +242,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_dept sd ON sd.dept_id = ate.dept_id LEFT JOIN acc_trade_wallet_detail atwd ON ate.trade_id = atwd.trade_id - ate.trade_type = #{param.tradeType} and ate.pay_state = 3 + + ate.trade_type = #{param.tradeType} + + + and ate.pay_state = #{param.payState} + and ate.trade_time = ]]> #{param.startDateTime}