push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiPremiumRemittanceServiceImpl.java

@@ -6,6 +6,7 @@ import com.yd.common.enums.CommonEnum;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
 import com.yd.common.utils.RandomStringGenerator;
+import com.yd.common.utils.UrlPathExtractor;
 import com.yd.csf.api.service.ApiPremiumRemittanceFileService;
 import com.yd.csf.api.service.ApiPremiumRemittanceService;
 import com.yd.csf.feign.dto.premiumremittance.ApiPremiumRemittanceDto;
@@ -15,6 +16,9 @@ import com.yd.csf.feign.response.premiumreconciliation.ApiPremiumReconciliationP
 import com.yd.csf.service.dto.PremiumRemittanceDto;
 import com.yd.csf.service.model.PremiumRemittance;
 import com.yd.csf.service.service.IPremiumRemittanceService;
+import com.yd.oss.feign.client.ApiOssFileFeignClient;
+import com.yd.oss.feign.request.ApiOssFileListRequest;
+import com.yd.oss.feign.response.ApiOssFileListResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -38,6 +42,9 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ
     @Autowired
     private ApiPremiumRemittanceFileService apiPremiumRemittanceFileService;
 
+    @Autowired
+    private ApiOssFileFeignClient apiOssFileFeignClient;
+
     /**
      * 分页列表查询-保费对账汇款记录信息
      * @param request
@@ -176,9 +183,41 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ
             ApiPremiumRemittanceDto remittanceDto = new ApiPremiumRemittanceDto();
             BeanUtils.copyProperties(dto,remittanceDto);
             //支付凭证列表
-            remittanceDto.setPaymentVoucherList(StringUtils.isNotBlank(dto.getPaymentVoucher()) ? Arrays.asList(dto.getPaymentVoucher().split(";").clone()) : new ArrayList<>());
+            ApiOssFileListRequest request = new ApiOssFileListRequest();
+            if (StringUtils.isNotBlank(dto.getPaymentVoucher())) {
+                List<String> fileKeyList = UrlPathExtractor.extractPaths(dto.getPaymentVoucher());
+                request.setFileKeyList(fileKeyList);
+                Result<List<ApiOssFileListResponse>> result = apiOssFileFeignClient.list(request);
+                if (!CollectionUtils.isEmpty(result.getData())) {
+                    List<ApiPremiumRemittanceFileDto> paymentVoucherDtoList = result.getData().stream().map(d -> {
+                        ApiPremiumRemittanceFileDto fileDto = new ApiPremiumRemittanceFileDto();
+                        fileDto.setFileName(d.getOriginalName());
+                        fileDto.setFileUrl(d.getFileUrl());
+                        fileDto.setFileType(d.getFileType());
+                        return fileDto;
+                    }).collect(Collectors.toList());
+                    remittanceDto.setPaymentVoucherDtoList(paymentVoucherDtoList);
+                }
+            }
+//            remittanceDto.setPaymentVoucherList(StringUtils.isNotBlank(dto.getPaymentVoucher()) ? Arrays.asList(dto.getPaymentVoucher().split(";").clone()) : new ArrayList<>());
             //账户证明列表
-            remittanceDto.setAccountVerificationList(StringUtils.isNotBlank(dto.getAccountVerification()) ? Arrays.asList(dto.getAccountVerification().split(";").clone()) : new ArrayList<>());
+            ApiOssFileListRequest request1 = new ApiOssFileListRequest();
+            if (StringUtils.isNotBlank(dto.getAccountVerification())) {
+                List<String> fileKeyList = UrlPathExtractor.extractPaths(dto.getAccountVerification());
+                request1.setFileKeyList(fileKeyList);
+                Result<List<ApiOssFileListResponse>> result = apiOssFileFeignClient.list(request1);
+                if (!CollectionUtils.isEmpty(result.getData())) {
+                    List<ApiPremiumRemittanceFileDto> accountVerificationDtoList = result.getData().stream().map(d -> {
+                        ApiPremiumRemittanceFileDto fileDto = new ApiPremiumRemittanceFileDto();
+                        fileDto.setFileName(d.getOriginalName());
+                        fileDto.setFileUrl(d.getFileUrl());
+                        fileDto.setFileType(d.getFileType());
+                        return fileDto;
+                    }).collect(Collectors.toList());
+                    remittanceDto.setAccountVerificationDtoList(accountVerificationDtoList);
+                }
+            }
+//            remittanceDto.setAccountVerificationList(StringUtils.isNotBlank(dto.getAccountVerification()) ? Arrays.asList(dto.getAccountVerification().split(";").clone()) : new ArrayList<>());
 
             //其他资料列表
             List<ApiPremiumRemittanceFileDto> fileDtoList = apiPremiumRemittanceFileService.apiPremiumRemittanceFileDtoList(dto.getPremiumRemittanceBizId());

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/premiumremittance/ApiPremiumRemittanceDto.java

@@ -86,6 +86,18 @@ public class ApiPremiumRemittanceDto {
     private List<String> accountVerificationList;
 
     /**
+     * 支付凭证列表
+     */
+    @NotEmpty(message = "支付凭证列表不能为空")
+    private List<ApiPremiumRemittanceFileDto> paymentVoucherDtoList;
+
+    /**
+     * 账户证明列表
+     */
+    @NotEmpty(message = "账户证明列表不能为空")
+    private List<ApiPremiumRemittanceFileDto> accountVerificationDtoList;
+
+    /**
      * 其他资料列表
      */
     private List<ApiPremiumRemittanceFileDto> apiPremiumRemittanceFileDtoList;