From 661e24d0cba846b28a94e1cc82dade1e6a4af402 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 20 Oct 2025 17:00:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:app=E6=9F=A5=E8=AF=A2=E8=87=AA=E6=8F=90?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bsd/pjcloud/wallet/api/dto/mch/MchPickUpDto.java | 5 +++++
 .../wallet/service/impl/mch/MchPickUpServiceImpl.java    | 9 +++++++++
 .../src/main/resources/mapper/mch/MchPickUpMapper.xml    | 6 ++++++
 3 files changed, 20 insertions(+)

diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/mch/MchPickUpDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/mch/MchPickUpDto.java
index 31fd34c89..fb3f74580 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/mch/MchPickUpDto.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/mch/MchPickUpDto.java
@@ -13,4 +13,9 @@ public class MchPickUpDto extends MchPickUpEntity {
      */
     private List<Long> mchIds;
 
+    /**
+     * ids
+     */
+    private List<Long> ids;
+
 }
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchPickUpServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchPickUpServiceImpl.java
index e96fa303e..7e145ab19 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchPickUpServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchPickUpServiceImpl.java
@@ -33,6 +33,15 @@ public class MchPickUpServiceImpl extends ServiceImpl<MchPickUpMapper, MchPickUp
 
     @Override
     public Page<MchPickUpVo> scopPageJoin(Page page, MchPickUpDto dto, DataScope dataScope) {
+        // 按照商户ids查询
+        if (ObjectUtil.isNotEmpty(dto.getMchIds())) {
+            List<MchPickUpJoinEntity> joinList = pickUpJoinMapper.selectList(new LambdaQueryWrapper<MchPickUpJoinEntity>()
+                    .in(MchPickUpJoinEntity::getMchId, dto.getMchIds())
+            );
+            if (ObjectUtil.isEmpty(joinList)) return new Page<>();
+            List<Long> machPickUpIds = joinList.stream().map(MchPickUpJoinEntity::getMchPickUpId).toList();
+            dto.setIds(machPickUpIds);
+        }
         return baseMapper.scopPageJoin(page, dto, dataScope);
     }
 
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchPickUpMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchPickUpMapper.xml
index a08926367..e8ec31c51 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchPickUpMapper.xml
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchPickUpMapper.xml
@@ -33,6 +33,12 @@
         <if test="dto.status != null and dto.status != '' ">
             and a.status = #{dto.status}
         </if>
+        <if test="dto.ids != null and dto.ids.size() != 0">
+            and a.id in
+            <foreach collection="dto.ids" item="v" open="(" close=")" separator=",">
+                #{v}
+            </foreach>
+        </if>
     </sql>
 
     <select id="scopPageJoin" resultType="com.bsd.pjcloud.wallet.api.vo.mch.MchPickUpVo">