Skip to content

F
fit-finance
Commit 494d7662 by 程裕兵
Options

fix:npe

parent 9e6b71c4
Showing with 3 additions and 3 deletions
service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/StudioMerchantServiceImpl.java
...@@ -106,7 +106,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService { ...@@ -106,7 +106,7 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
executor.execute(() -> { executor.execute(() -> {
try { try {
Map<ResourceTypeEnums, ResourceInfo> resourceMap = this.upload(params); Map<ResourceTypeEnums, ResourceInfo> resourceMap = this.upload(params, apply);
SubChannelInfoDTO subChannel = configService.getDefaultBrandSubChannelInfo(); SubChannelInfoDTO subChannel = configService.getDefaultBrandSubChannelInfo();
...@@ -303,12 +303,12 @@ public class StudioMerchantServiceImpl implements StudioMerchantService { ...@@ -303,12 +303,12 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
config.getAppId())); config.getAppId()));
} }
private Map<ResourceTypeEnums, ResourceInfo> upload(ApplyStudioMerchantParams params) { private Map<ResourceTypeEnums, ResourceInfo> upload(ApplyStudioMerchantParams params, StudioMerchantApply apply) {
Map<ResourceTypeEnums, ResourceInfo> resourceMap = MerchantConvert.convertResourceMap( Map<ResourceTypeEnums, ResourceInfo> resourceMap = MerchantConvert.convertResourceMap(
params.getResourceMap()); params.getResourceMap());
Map<Long, ResourceInfoVO> resourceIdUrlMap = resourceRpcService.getResourceMap(params.getStudioId(), Map<Long, ResourceInfoVO> resourceIdUrlMap = resourceRpcService.getResourceMap(apply.getBrandId(),
getResourceIds(resourceMap)); getResourceIds(resourceMap));
resourceMap.keySet().forEach(type -> { resourceMap.keySet().forEach(type -> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment