Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test

performance-api/src/main/java/com/clx/performance/param/feign/transport/OrderChildDriverInfoDTO.java

@@ -55,25 +55,25 @@ public class OrderChildDriverInfoDTO {
     private String faceCardImg;
 
     @ApiModelProperty(value = "驾驶证号码", dataType="String", required = true)
-    @NotBlank(message = "驾驶证号码不能为空")
+//    @NotBlank(message = "驾驶证号码不能为空")
     private String licenceNo;
     @ApiModelProperty(value = "初次领证日期", dataType="String", required = true)
-    @NotBlank(message = "初次领证日期不能为空")
+//    @NotBlank(message = "初次领证日期不能为空")
     private String licenseTime;
     @ApiModelProperty(value = "驾照类型", dataType="String", required = true)
-    @NotBlank(message = "驾照类型不能为空")
+//    @NotBlank(message = "驾照类型不能为空")
     private String licenceClass;
     @ApiModelProperty(value = "驾驶证正面图片", dataType="String", required = true)
-    @NotBlank(message = "驾驶证正面图片不能为空")
+//    @NotBlank(message = "驾驶证正面图片不能为空")
     private String licenceImg;
     @ApiModelProperty(value = "驾驶证背面图片", dataType="String", required = true)
-    @NotBlank(message = "驾驶证背面图片不能为空")
+//    @NotBlank(message = "驾驶证背面图片不能为空")
     private String licenceBackImg;
     @ApiModelProperty(value = "驾驶证有效期起始时间", dataType="String", required = true)
-    @NotBlank(message = "驾驶证有效期起始时间不能为空")
+//    @NotBlank(message = "驾驶证有效期起始时间不能为空")
     private String licenceStartTime;
     @ApiModelProperty(value = "驾驶证有效期终止时间", dataType="String", required = true)
-    @NotBlank(message = "驾驶证有效期终止时间不能为空")
+//    @NotBlank(message = "驾驶证有效期终止时间不能为空")
     private String licenceEndTime;
 
 //    @ApiModelProperty(value = "道路运输许可证图片地址", dataType="String", required = true)
@@ -81,20 +81,20 @@ public class OrderChildDriverInfoDTO {
 //    private String transportLicenceImg;
 
     @ApiModelProperty(value = "道路运输从业资格证号", dataType="String", required = true)
-    @NotBlank(message = "道路运输从业资格证号不能为空")
+//    @NotBlank(message = "道路运输从业资格证号不能为空")
     private String occupationalLicenceNo;
     @ApiModelProperty(value = "道路运输从业资格证图片地址", dataType="String", required = true)
-    @NotBlank(message = "道路运输从业资格证图片地址不能为空")
+//    @NotBlank(message = "道路运输从业资格证图片地址不能为空")
     private String occupationalLicenceImg;
     @ApiModelProperty(value = "从业资格证有效期起始时间", dataType="String", required = true)
-    @NotBlank(message = "从业资格证有效期起始时间不能为空")
+//    @NotBlank(message = "从业资格证有效期起始时间不能为空")
     private String occupationalStartTime;
     @ApiModelProperty(value = "从业资格证有效期终止时间", dataType="String", required = true)
-    @NotBlank(message = "从业资格证有效期终止时间不能为空")
+//    @NotBlank(message = "从业资格证有效期终止时间不能为空")
     private String occupationalEndTime;
 
     @ApiModelProperty(value = "驾驶证发证机关", required = true)
-    @NotBlank(message = "驾驶证发证机关不能为空")
+//    @NotBlank(message = "驾驶证发证机关不能为空")
     private String licenceIssueOrganization;
     @ApiModelProperty(value = "身份证住址", required = true)
 //    @NotBlank(message = "身份证住址不能为空")

performance-web/src/main/java/com/clx/performance/service/impl/TransportSyncServiceImpl.java

@@ -246,18 +246,21 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         dto.setCardFrontImg(documentFeign.getHost().getData() + idCardVO.getCardFaceImg());
         dto.setCardBackImg(documentFeign.getHost().getData() + idCardVO.getCardBackImg());
         dto.setFaceCardImg(documentFeign.getHost().getData() + idCardVO.getCardFaceImg());
-        dto.setLicenceNo(licenceVO.getLicenceNo());
-        dto.setLicenseTime(licenceVO.getLicenceTime() == null ? null : DateUtils.formatDateTime(licenceVO.getLicenceTime()).get());
-        dto.setLicenceClass(licenceVO.getLicenceClass());
-        dto.setLicenceImg(documentFeign.getHost().getData() + licenceVO.getLicenceImg());
-        dto.setLicenceBackImg(documentFeign.getHost().getData() + licenceVO.getLicenceBackImg());
-        dto.setLicenceStartTime(Optional.ofNullable(licenceVO.getLicenceStartTime()).isPresent() ?  DateUtils.formatDateTime(licenceVO.getLicenceStartTime()).get() : null);
-        dto.setLicenceEndTime(Optional.ofNullable(licenceVO.getLicenceEndTime()).isPresent() ? DateUtils.formatDateTime(licenceVO.getLicenceEndTime()).get() : "2099-12-31 00:00:00");
-        dto.setOccupationalLicenceNo(licenceVO.getOccupationalLicenceNo());
-        dto.setOccupationalLicenceImg(documentFeign.getHost().getData() + licenceVO.getOccupationalLicenceImg());
-        dto.setOccupationalStartTime(licenceVO.getOccupationalLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getOccupationalLicenceStartTime()).get());
-        dto.setOccupationalEndTime(licenceVO.getOccupationalLicenceEndTime() == null ? null : DateUtils.formatDateTime(licenceVO.getOccupationalLicenceEndTime()).get());
-        dto.setLicenceIssueOrganization(licenceVO.getLicenceIssueOrganization());
+        if (null != licenceVO) {
+            dto.setLicenceNo(licenceVO.getLicenceNo());
+            dto.setLicenseTime(licenceVO.getLicenceTime() == null ? null : DateUtils.formatDateTime(licenceVO.getLicenceTime()).get());
+            dto.setLicenceClass(licenceVO.getLicenceClass());
+            dto.setLicenceImg(documentFeign.getHost().getData() + licenceVO.getLicenceImg());
+            dto.setLicenceBackImg(documentFeign.getHost().getData() + licenceVO.getLicenceBackImg());
+            dto.setLicenceStartTime(Optional.ofNullable(licenceVO.getLicenceStartTime()).isPresent() ?  DateUtils.formatDateTime(licenceVO.getLicenceStartTime()).get() : null);
+            dto.setLicenceEndTime(Optional.ofNullable(licenceVO.getLicenceEndTime()).isPresent() ? DateUtils.formatDateTime(licenceVO.getLicenceEndTime()).get() : "2099-12-31 00:00:00");
+            dto.setOccupationalLicenceNo(licenceVO.getOccupationalLicenceNo());
+            dto.setOccupationalLicenceImg(documentFeign.getHost().getData() + licenceVO.getOccupationalLicenceImg());
+            dto.setOccupationalStartTime(licenceVO.getOccupationalLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getOccupationalLicenceStartTime()).get());
+            dto.setOccupationalEndTime(licenceVO.getOccupationalLicenceEndTime() == null ? null : DateUtils.formatDateTime(licenceVO.getOccupationalLicenceEndTime()).get());
+            dto.setLicenceIssueOrganization(licenceVO.getLicenceIssueOrganization());
+        }
+
         dto.setIdCardAddress(idCardVO.getAddress());
         param.setTruckDriverInfoDTO(dto);
     }

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementServiceImpl.java

@@ -106,6 +106,7 @@ public class SettlementServiceImpl implements SettlementService {
                             ;
                 }).map(OwnerRunningWaterRecord::getAlterationBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
                 BigDecimal subtract = frozen.subtract(takeOut);
+                log.info("冻结预付运费:{}, 扣除的流水总和：{}", frozen, takeOut);
                 if (subtract.compareTo(BigDecimal.ZERO) <= 0) {
                     settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
                 } else {
@@ -113,6 +114,8 @@ public class SettlementServiceImpl implements SettlementService {
                         OwnerAccount account = ownerAccountDao.getAccountByOwnerUserNoAndAccountType(orderChild.getOwnerUserNo(),
                                 OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
                         settlementOwnerDetail.setPrepayFreight(ans);
+                        invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
+
                         //生成扣除流水
                         OwnerRunningWaterRecord runningWaterRecord = new OwnerRunningWaterRecord();
                         runningWaterRecord.setOwnerUserName(orderChild.getOwnerName());