fix:npe

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

@@ -106,7 +106,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
     executor.execute(() -> {
       try {
 
-        Map<ResourceTypeEnums, ResourceInfo> resourceMap = this.upload(params);
+        Map<ResourceTypeEnums, ResourceInfo> resourceMap = this.upload(params, apply);
 
         SubChannelInfoDTO subChannel = configService.getDefaultBrandSubChannelInfo();
 
@@ -303,12 +303,12 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
                 config.getAppId()));
   }
 
-  private Map<ResourceTypeEnums, ResourceInfo> upload(ApplyStudioMerchantParams params) {
+  private Map<ResourceTypeEnums, ResourceInfo> upload(ApplyStudioMerchantParams params, StudioMerchantApply apply) {
 
     Map<ResourceTypeEnums, ResourceInfo> resourceMap = MerchantConvert.convertResourceMap(
         params.getResourceMap());
 
-    Map<Long, ResourceInfoVO> resourceIdUrlMap = resourceRpcService.getResourceMap(params.getStudioId(),
+    Map<Long, ResourceInfoVO> resourceIdUrlMap = resourceRpcService.getResourceMap(apply.getBrandId(),
         getResourceIds(resourceMap));
 
     resourceMap.keySet().forEach(type -> {