Commit 8de51d91 by 吴一龙

fix

parent 4134ea9a
......@@ -15,7 +15,6 @@ import com.jiejing.common.request.IdRequest;
import com.jiejing.common.request.IdsRequest;
import com.jiejing.common.utils.convert.BeanUtil;
import com.jiejing.common.utils.crypt.AesUtil;
import com.jiejing.filecenter.api.resource.vo.ResourceInfoVO;
import com.jiejing.fitness.enums.delay.DelayTaskCodeEnum;
import com.jiejing.fitness.enums.finance.PartyTypeEnum;
import com.jiejing.fitness.finance.api.axf.enums.AxfOrderSignStateEnums;
......@@ -1016,11 +1015,11 @@ public class AxfServiceImpl implements AxfService {
private Map<ResourceTypeEnums, ResourceInfo> upload(StudioAxfApplyRequest request, StudioAxfApply apply) {
return AxfConvert.toResourceMap(request, resourceIds -> {
Map<Long, ResourceInfoVO> urlMap = resourceRpcService.getResourceMap(
Map<Long, com.jiejing.fos.api.vo.ResourceInfoVO> urlMap = resourceRpcService.getResourceMap(
request.getBrandId(), resourceIds);
Map<Long, String> thirdMap = new HashMap<>(2);
urlMap.keySet().forEach(resourceId -> {
ResourceInfoVO info = urlMap.get(resourceId);
com.jiejing.fos.api.vo.ResourceInfoVO info = urlMap.get(resourceId);
JsonResult<UploadVO> result = merchantApi.upload(
UploadRequest.builder().channelNo(AxfConst.CHANNEL_NO).url(info.getUrl())
.resourceType(ResourceTypeEnums.LICENSE).suffix(info.getSuffix())
......@@ -1107,7 +1106,7 @@ public class AxfServiceImpl implements AxfService {
private StudioAxfApplyVO toVO(StudioAxfApply apply) {
return AxfConvert.toVO(apply, vo -> {
Map<Long, ResourceInfoVO> map = resourceRpcService.getResourceMap(apply.getBrandId(),
Map<Long, com.jiejing.fos.api.vo.ResourceInfoVO> map = resourceRpcService.getResourceMap(apply.getBrandId(),
Lists.newArrayList(vo.getLicenseResourceId(), vo.getStoreHeadResourceId()));
vo.setLicenseResourceUrl(map.get(vo.getLicenseResourceId()).getUrl());
vo.setStoreHeadResourceUrl(map.get(vo.getStoreHeadResourceId()).getUrl());
......
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