feat:list merchant

service/src/main/java/com/jiejing/fitness/finance/service/merchant/convert/MerchantConvert.java

@@ -541,7 +541,7 @@ public class MerchantConvert {
   public static List<BrandMerchantVO> convertBrandMerchantList(Long brandId, List<MerchantVO> merchants,
   public static List<BrandMerchantVO> convertBrandMerchantList(Long brandId, List<MerchantVO> merchants,
       SubChannelInfoDTO dto, Map<Long, List<StudioVO>> studioMap, Map<Long, StudioMerchantApply> applyMap) {
       SubChannelInfoDTO dto, Map<Long, List<StudioVO>> studioMap, Map<Long, StudioMerchantApply> applyMap) {
     return merchants.stream().map(e -> {
     return merchants.stream().map(e -> {
-      List<String> studioNames = studioMap.getOrDefault(e.getId(), new ArrayList<>()).stream()
+      List<String> studioNames = studioMap.getOrDefault(brandId, new ArrayList<>()).stream()
           .map(StudioVO::getName).collect(Collectors.toList());
           .map(StudioVO::getName).collect(Collectors.toList());
       return convertBrandMerchant(brandId, studioNames, e, dto, applyMap.get(e.getId()));
       return convertBrandMerchant(brandId, studioNames, e, dto, applyMap.get(e.getId()));
     }).collect(Collectors.toList());
     }).collect(Collectors.toList());