From a143db7cd16c110bd3ece386e8b5e0c13cc02831 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sun, 21 Sep 2025 13:41:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=A2=86=E5=8F=96=E4=BA=BA=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjcloud/wallet/api/entity/act/ActCancelItemEntity.java  | 6 ++++++
 .../wallet/service/impl/act/ActCancelItemServiceImpl.java   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/act/ActCancelItemEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/act/ActCancelItemEntity.java
index bb83a5209..68bbd2a4f 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/act/ActCancelItemEntity.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/act/ActCancelItemEntity.java
@@ -44,6 +44,12 @@ public class ActCancelItemEntity extends Model<ActCancelItemEntity> {
     @Schema(description = "领取人用户id")
     private Long receiverUserId;
 
+    /**
+     * 领取人用户名
+     */
+    @Schema(description = "领取人用户名")
+    private String receiverUserName;
+
     /**
      * 领取时间
      */
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java
index 2324cfe0f..fd0901ba7 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java
@@ -55,6 +55,7 @@ public class ActCancelItemServiceImpl extends ServiceImpl<ActCancelItemMapper, A
         Page<ActCancelItemVo> pageList = baseMapper.selectPage(page, new LambdaQueryWrapper<ActCancelItemEntity>()
                 .eq(ObjectUtil.isNotEmpty(dto.getMchId()), ActCancelItemEntity::getMchId, dto.getMchId())
                 .eq(ObjectUtil.isNotEmpty(dto.getReceiverUserId()), ActCancelItemEntity::getReceiverUserId, dto.getReceiverUserId())
+                .like(ObjectUtil.isNotEmpty(dto.getReceiverUserName()), ActCancelItemEntity::getReceiverUserName, dto.getReceiverUserName())
                 .eq(ObjectUtil.isNotEmpty(dto.getCancelUserId()), ActCancelItemEntity::getCancelUserId, dto.getCancelUserId())
                 .eq(ObjectUtil.isNotEmpty(dto.getActStatus()), ActCancelItemEntity::getActStatus, dto.getActStatus())
                 .orderByDesc(ActCancelItemEntity::getReceiverTime)
@@ -141,6 +142,7 @@ public class ActCancelItemServiceImpl extends ServiceImpl<ActCancelItemMapper, A
         saveObj.setActId(-1L);
         saveObj.setMchId(actMch.getId());
         saveObj.setReceiverUserId(user.getId());
+        saveObj.setReceiverUserName(user.getUsername());
         saveObj.setReceiverTime(now);
         saveObj.setActStatus(ActCancelStatusEnum.CANCEL_AWAIT.getCode());
         saveObj.setExpireTime(expireTime);