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}