feat:config

api/src/main/java/com/jiejing/fitness/finance/api/merchant/vo/BrandMerchantVO.java

@@ -6,8 +6,10 @@ import com.jiejing.fitness.finance.api.merchant.model.BrandLicenseInfo;
 import com.jiejing.fitness.finance.api.merchant.model.BrandResourceInfo;
 import com.jiejing.fitness.finance.api.merchant.model.BrandResourceInfo;
 import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
+import com.jiejing.paycenter.common.model.SubChannelConfigInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
@@ -93,4 +95,7 @@ public class BrandMerchantVO {
   @ApiModelProperty(value = "进件所需资料")
   @ApiModelProperty(value = "进件所需资料")
   private BrandResourceInfo resource;
   private BrandResourceInfo resource;
 
 
+  @ApiModelProperty("子渠道配置记录")
+  private List<SubChannelConfigInfo> subChannelConfigs;
+
 }
 }

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

@@ -450,6 +450,7 @@ public class MerchantConvert {
         .legal(convertLegal(merchant.getLegal(), merchant.getContact()))
         .legal(convertLegal(merchant.getLegal(), merchant.getContact()))
         .bankCard(convertBankCard(merchant.getBankCard()))
         .bankCard(convertBankCard(merchant.getBankCard()))
         .resource(convertResource(merchant.getResourceMap()))
         .resource(convertResource(merchant.getResourceMap()))
+        .subChannelConfigs(merchant.getSubChannelConfigs())
         .build();
         .build();
   }
   }