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 mchIds; + /** + * ids + */ + private List 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 scopPageJoin(Page page, MchPickUpDto dto, DataScope dataScope) { + // 按照商户ids查询 + if (ObjectUtil.isNotEmpty(dto.getMchIds())) { + List joinList = pickUpJoinMapper.selectList(new LambdaQueryWrapper() + .in(MchPickUpJoinEntity::getMchId, dto.getMchIds()) + ); + if (ObjectUtil.isEmpty(joinList)) return new Page<>(); + List 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 @@ and a.status = #{dto.status} + + and a.id in + + #{v} + +