bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

5978 补贴明细的补贴清空明细中出现个人钱包的清空数据（个人钱包中点击钱包清空按钮）

This commit is contained in:
gaowdong 2025-05-09 14:06:10 +08:00
parent a5d766d8e8
commit 906dda1d69
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccSubsidyController.java
View File

@ -1,6 +1,7 @@
package com.bonus.canteen.core.account.controller; package com.bonus.canteen.core.account.controller;
import com.bonus.canteen.core.account.constants.AccTradeTypeEnum; 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.domain.param.*;
import com.bonus.canteen.core.account.service.AccSubService; import com.bonus.canteen.core.account.service.AccSubService;
import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.controller.BaseController;
@ -76,6 +77,7 @@ public class AccSubsidyController extends BaseController {
public TableDataInfo queryAccSubOperationClearList(@RequestBody AccWalletOperationQueryParam request) { public TableDataInfo queryAccSubOperationClearList(@RequestBody AccWalletOperationQueryParam request) {
startPage(); startPage();
request.setTradeType(AccTradeTypeEnum.CLEAR.getKey()); request.setTradeType(AccTradeTypeEnum.CLEAR.getKey());
request.setWalletId(AccWalletIdEnum.SUBSIDY.getKey());
return getDataTable(accSubService.queryAccSubOperationList(request)); return getDataTable(accSubService.queryAccSubOperationList(request));
} }
} }

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccWalletOperationQueryParam.java
View File

@ -25,6 +25,7 @@ public class AccWalletOperationQueryParam extends BaseEntity {
private String searchValue; private String searchValue;
private String createBy; private String createBy;
private Long userId; private Long userId;
private Integer walletId;
public AccWalletOperationQueryParam() { public AccWalletOperationQueryParam() {
this.endDateTime = LocalDateTime.now().plusDays(7); this.endDateTime = LocalDateTime.now().plusDays(7);

3
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
View File

@ -248,6 +248,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="param.payState != null"> <if test="param.payState != null">
and ate.pay_state = #{param.payState} and ate.pay_state = #{param.payState}
</if> </if>
<if test="param.walletId != null">
and atwd.wallet_id = #{param.walletId}
</if>
<if test="param.startDateTime != null"> <if test="param.startDateTime != null">
and ate.trade_time <![CDATA[ >= ]]> #{param.startDateTime} and ate.trade_time <![CDATA[ >= ]]> #{param.startDateTime}
</if> </if>