From 906dda1d6980b06b57c7a4d30e380e5f7a2ee876 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Fri, 9 May 2025 14:06:10 +0800 Subject: [PATCH] =?UTF-8?q?5978=20=E8=A1=A5=E8=B4=B4=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E7=9A=84=E8=A1=A5=E8=B4=B4=E6=B8=85=E7=A9=BA=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E4=B8=AD=E5=87=BA=E7=8E=B0=E4=B8=AA=E4=BA=BA=E9=92=B1=E5=8C=85?= =?UTF-8?q?=E7=9A=84=E6=B8=85=E7=A9=BA=E6=95=B0=E6=8D=AE=EF=BC=88=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E9=92=B1=E5=8C=85=E4=B8=AD=E7=82=B9=E5=87=BB=E9=92=B1?= =?UTF-8?q?=E5=8C=85=E6=B8=85=E7=A9=BA=E6=8C=89=E9=92=AE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/core/account/controller/AccSubsidyController.java | 2 ++ .../account/domain/param/AccWalletOperationQueryParam.java | 1 + .../src/main/resources/mapper/account/AccTradeMapper.xml | 3 +++ 3 files changed, 6 insertions(+) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccSubsidyController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccSubsidyController.java index a7b8acc..75b63e8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccSubsidyController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccSubsidyController.java @@ -1,6 +1,7 @@ package com.bonus.canteen.core.account.controller; import com.bonus.canteen.core.account.constants.AccTradeTypeEnum; +import com.bonus.canteen.core.account.constants.AccWalletIdEnum; import com.bonus.canteen.core.account.domain.param.*; import com.bonus.canteen.core.account.service.AccSubService; import com.bonus.common.core.web.controller.BaseController; @@ -76,6 +77,7 @@ public class AccSubsidyController extends BaseController { public TableDataInfo queryAccSubOperationClearList(@RequestBody AccWalletOperationQueryParam request) { startPage(); request.setTradeType(AccTradeTypeEnum.CLEAR.getKey()); + request.setWalletId(AccWalletIdEnum.SUBSIDY.getKey()); return getDataTable(accSubService.queryAccSubOperationList(request)); } } 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 b3d9b52..1fb106a 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 @@ -25,6 +25,7 @@ public class AccWalletOperationQueryParam extends BaseEntity { private String searchValue; private String createBy; private Long userId; + private Integer walletId; public AccWalletOperationQueryParam() { 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 c9ca8dd..b45a9f0 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 @@ -248,6 +248,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ate.pay_state = #{param.payState} + + and atwd.wallet_id = #{param.walletId} + and ate.trade_time = ]]> #{param.startDateTime}