feat:app查询自提点

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;
+
 }

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);
     }
 

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">