push

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

@@ -90,9 +90,23 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ
         PremiumRemittance premiumRemittance = result.getData();
         PremiumRemittance premiumRemittance = result.getData();
         BeanUtils.copyProperties(request,premiumRemittance);
         BeanUtils.copyProperties(request,premiumRemittance);
         //支付凭证
         //支付凭证
-        premiumRemittance.setPaymentVoucher(!CollectionUtils.isEmpty(request.getPaymentVoucherList()) ? String.join(";",request.getPaymentVoucherList()) : "");
+        List<String> paymentVoucherList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(request.getPaymentVoucherDtoList())) {
+            paymentVoucherList = request.getPaymentVoucherDtoList().stream()
+                    .filter(dto -> StringUtils.isNotBlank(dto.getFileUrl()))
+                    .map(ApiPremiumRemittanceFileDto::getFileUrl)
+                    .collect(Collectors.toList());
+        }
+        premiumRemittance.setPaymentVoucher(!CollectionUtils.isEmpty(paymentVoucherList) ? String.join(";",paymentVoucherList) : "");
         //账户证明
         //账户证明
-        premiumRemittance.setAccountVerification(!CollectionUtils.isEmpty(request.getAccountVerificationList()) ? String.join(";",request.getAccountVerificationList()) : "");
+        List<String> accountVerificationList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(request.getAccountVerificationDtoList())) {
+            accountVerificationList = request.getAccountVerificationDtoList().stream()
+                    .filter(dto -> StringUtils.isNotBlank(dto.getFileUrl()))
+                    .map(ApiPremiumRemittanceFileDto::getFileUrl)
+                    .collect(Collectors.toList());
+        }
+        premiumRemittance.setAccountVerification(!CollectionUtils.isEmpty(accountVerificationList) ? String.join(";",accountVerificationList) : "");
         iPremiumRemittanceService.saveOrUpdate(premiumRemittance);
         iPremiumRemittanceService.saveOrUpdate(premiumRemittance);
         //保存-保费对账汇款记录附件列表
         //保存-保费对账汇款记录附件列表
         apiPremiumRemittanceFileService.savePremiumRemittanceFileList(request.getApiPremiumRemittanceFileDtoList(),request.getPremiumRemittanceBizId());
         apiPremiumRemittanceFileService.savePremiumRemittanceFileList(request.getApiPremiumRemittanceFileDtoList(),request.getPremiumRemittanceBizId());
@@ -154,9 +168,23 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ
             //保费对账-汇款记录表唯一业务ID
             //保费对账-汇款记录表唯一业务ID
             premiumRemittance.setPremiumRemittanceBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_PREMIUM_REMITTANCE.getCode()));
             premiumRemittance.setPremiumRemittanceBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_PREMIUM_REMITTANCE.getCode()));
             //支付凭证
             //支付凭证
-            premiumRemittance.setPaymentVoucher(!CollectionUtils.isEmpty(dto.getPaymentVoucherList()) ? String.join(";",dto.getPaymentVoucherList()) : "");
+            List<String> paymentVoucherList = new ArrayList<>();
+            if (!CollectionUtils.isEmpty(dto.getPaymentVoucherDtoList())) {
+                paymentVoucherList = dto.getPaymentVoucherDtoList().stream()
+                        .filter(dto1 -> StringUtils.isNotBlank(dto1.getFileUrl()))
+                        .map(ApiPremiumRemittanceFileDto::getFileUrl)
+                        .collect(Collectors.toList());
+            }
+            premiumRemittance.setPaymentVoucher(!CollectionUtils.isEmpty(paymentVoucherList) ? String.join(";",paymentVoucherList) : "");
             //账户证明
             //账户证明
-            premiumRemittance.setAccountVerification(!CollectionUtils.isEmpty(dto.getAccountVerificationList()) ? String.join(";",dto.getAccountVerificationList()) : "");
+            List<String> accountVerificationList = new ArrayList<>();
+            if (!CollectionUtils.isEmpty(dto.getAccountVerificationDtoList())) {
+                accountVerificationList = dto.getAccountVerificationDtoList().stream()
+                        .filter(dto1 -> StringUtils.isNotBlank(dto1.getFileUrl()))
+                        .map(ApiPremiumRemittanceFileDto::getFileUrl)
+                        .collect(Collectors.toList());
+            }
+            premiumRemittance.setAccountVerification(!CollectionUtils.isEmpty(accountVerificationList) ? String.join(";",accountVerificationList) : "");
             iPremiumRemittanceService.saveOrUpdate(premiumRemittance);
             iPremiumRemittanceService.saveOrUpdate(premiumRemittance);
 
 
             //添加-保费对账汇款记录附件列表
             //添加-保费对账汇款记录附件列表

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

@@ -73,17 +73,17 @@ public class ApiPremiumRemittanceDto {
     @JsonDeserialize(using = CustomLocalDateTimeDeserializer.class)
     @JsonDeserialize(using = CustomLocalDateTimeDeserializer.class)
     private LocalDateTime paymentDate;
     private LocalDateTime paymentDate;
 
 
-    /**
-     * 支付凭证列表
-     */
-    @NotEmpty(message = "支付凭证列表不能为空")
-    private List<String> paymentVoucherList;
-
-    /**
-     * 账户证明列表
-     */
-    @NotEmpty(message = "账户证明列表不能为空")
-    private List<String> accountVerificationList;
+//    /**
+//     * 支付凭证列表
+//     */
+//    @NotEmpty(message = "支付凭证列表不能为空")
+//    private List<String> paymentVoucherList;
+//
+//    /**
+//     * 账户证明列表
+//     */
+//    @NotEmpty(message = "账户证明列表不能为空")
+//    private List<String> accountVerificationList;
 
 
     /**
     /**
      * 支付凭证列表
      * 支付凭证列表