feat:global config

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

@@ -420,8 +420,10 @@ public class MerchantConvert {
     return ResourceInfo.builder().resourceId(id).type(type).build();
   }
 
-  public static BrandMerchantVO convertBrandMerchant(BrandToMerchant relation, MerchantVO merchant) {
-    Map<SubChannelOpenTypeEnums, SubChannelInfo> channelMap = convertSubChannelMap(merchant.getSubChannels());
+  public static BrandMerchantVO convertBrandMerchant(BrandToMerchant relation, MerchantVO merchant,
+      List<SubChannelInfo> defaultSubChannels) {
+    Map<SubChannelOpenTypeEnums, SubChannelInfo> channelMap = convertSubChannelMap(merchant.getSubChannels(),
+        defaultSubChannels);
     SubChannelInfo ali = channelMap.get(SubChannelOpenTypeEnums.ALI_OFFLINE);
     SubChannelInfo wxGzhOffline = channelMap.get(SubChannelOpenTypeEnums.WX_GZH_OFFLINE);
     OpenStateEnums wxOfflineState = convertWxOfflineState(channelMap);

service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/BrandMerchantServiceImpl.java

@@ -128,7 +128,8 @@ public class BrandMerchantServiceImpl implements BrandMerchantService {
   public BrandMerchantVO getMerchant(Long brandId) {
     BrandToMerchant relation = brandToMerchantRpService.getByBrandId(brandId);
     MerchantVO merchant = merchantRpcService.getByMerchantId(relation.getMerchantId());
-    return MerchantConvert.convertBrandMerchant(relation, merchant);
+    return MerchantConvert.convertBrandMerchant(relation, merchant,
+        getDefaultBrandSubChannelInfo().getSubChannels());
   }
 
   @Override