From 9f12744678f85092d5f00369402d7c5e877eed7b Mon Sep 17 00:00:00 2001 From: gaowdong Date: Tue, 29 Apr 2025 10:22:35 +0800 Subject: [PATCH 1/2] bug --- .../core/account/domain/param/AccountInfoQueryParam.java | 1 + .../canteen/core/account/domain/vo/AccInfoDetailsVO.java | 2 ++ .../src/main/resources/mapper/account/AccInfoMapper.xml | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccountInfoQueryParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccountInfoQueryParam.java index 583d00a..a0d5f9f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccountInfoQueryParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccountInfoQueryParam.java @@ -24,6 +24,7 @@ public class AccountInfoQueryParam extends BaseEntity { @ApiModelProperty("结束时间") private LocalDateTime endDateTime; private String searchValue; + private Integer userType; // @ApiModelProperty("钱包最小金额") // private BigDecimal walletMinAmount; // @ApiModelProperty("钱包最大金额") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccInfoDetailsVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccInfoDetailsVO.java index a69fdd9..73c14c6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccInfoDetailsVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccInfoDetailsVO.java @@ -1,6 +1,7 @@ package com.bonus.canteen.core.account.domain.vo; import com.bonus.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -35,6 +36,7 @@ public class AccInfoDetailsVO { private Long deptId; @ApiModelProperty("用户类别(展示)") @Excel(name = "用户类别(展示)") + @JsonIgnore private String userTypeName; @ApiModelProperty("账户总余额") @Excel(name = "账户总余额") diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml index 6d32a6a..3dde9de 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml @@ -433,6 +433,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and (t2.nick_name like CONCAT('%',#{accountInfoQueryParam.searchValue},'%') + or t2.user_id like CONCAT('%',#{accountInfoQueryParam.searchValue},'%') or t2.phonenumber = #{encryptedSearchValue} ) @@ -448,6 +449,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t1.update_time #{accountInfoQueryParam.endDateTime} + + and t2.user_type = #{accountInfoQueryParam.userType} + AND EXISTS( SELECT null FROM From 4ad58496a8c14998b05a8a1b5a4902d154d06530 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Tue, 29 Apr 2025 10:59:20 +0800 Subject: [PATCH 2/2] bug --- .../main/resources/mapper/account/AccOperationHistoryMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml index 654b9bf..db6163a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccOperationHistoryMapper.xml @@ -37,6 +37,7 @@ and (su.nick_name like CONCAT('%',#{param.searchValue},'%') or su.phonenumber = #{encryptedSearchValue} + or su.user_id like CONCAT('%',#{param.searchValue},'%') )