充值可用店铺列表

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java

@@ -225,13 +225,14 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
                     q1.eq(ShopInfo::getId, mainShopId);
                 });
             });
+            shopIdList = null;
         }else  {
             shopIdList.add(shopId);
             queryWrapper.in(ShopInfo::getId, shopIdList);
         }
 
 
-        return shopInfoService.list(queryWrapper)
+        return shopInfoService.getByMainIdOrList(mainShopId, shopIdList, shopName)
                 .stream()
                 .map(shop -> BeanUtil.copyProperties(shop, MkShopRechargeShopListVO.class))
                 .toList();