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

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

@@ -8,6 +8,7 @@ import lombok.ToString;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
 
 @Getter
 @Setter
@@ -71,6 +72,21 @@ public class OrderChildTruckInfoDTO {
     @ApiModelProperty(value = "运输证有效期结束时间")
     private String transportationLicenseEndTime;
 
+    @ApiModelProperty(value = "挂车牌号")
+    private String truckNo2;
+    @ApiModelProperty("挂车行驶证主页")
+    private String licenceImgMain2;
+    @ApiModelProperty("挂车行驶证副页")
+    private String licenceImgSecond2;
+    @ApiModelProperty("挂车行驶证副页背面")
+    private String licenceImgSecond2Back;
+    @ApiModelProperty("挂车年检有效期至")
+    private LocalDateTime licenceImgMain2EndTime;
+    @ApiModelProperty("挂车道路运输许可证编号")
+    private String roadTransportCertificateNo2;
+    @ApiModelProperty("挂车道路运输许可证图片地址")
+    private String transportLicenceImg2;
+
     @ApiModelProperty(value = "车辆燃料类型 1：柴油 2 天然气 3其他 4新能源/电", dataType="Integer", required = true)
     @NotNull(message = "车辆燃料类型不能为空")
     private Integer powerType;

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

@@ -18,6 +18,7 @@ import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.feign.transport.*;
 import com.clx.performance.service.TransportSyncService;
 import com.clx.performance.utils.gd.GdService;
+import com.clx.user.feign.DocumentFeign;
 import com.clx.user.feign.DriverFeign;
 import com.clx.user.feign.TruckFeign;
 import com.clx.user.vo.feign.*;
@@ -46,6 +47,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
     private final TruckFeign truckFeign;
     private final DriverFeign driverFeign;
     private final GdService gdService;
+    private final DocumentFeign documentFeign;
 
     @Override
     public ThirdOrderChildBrokerParam generateOrderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,SettlementDriverDetail settlementDriverDetail) {
@@ -140,15 +142,16 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         param.setInvoiceRelationNo(orderInfoFeign.getContactPhoneOwner());
         Optional<List<OrderChildImage>> listOptional = orderChildImageDao.listLoadAndUnload(orderChild.getChildNo());
         if (listOptional.isPresent()) {
+            List<String> loadPoundImages = new LinkedList<>();
+            List<String> unLoadPoundImages = new LinkedList<>();
             List<OrderChildImage> orderChildImages = listOptional.get();
-            List<String> loadPoundImages = orderChildImages.stream().filter(i -> {
-                        return i.getType().equals(1);
-                    }
-            ).map(OrderChildImage::getImage).collect(Collectors.toList());
-            List<String> unLoadPoundImages = orderChildImages.stream().filter(i -> {
-                        return i.getType().equals(2);
-                    }
-            ).map(OrderChildImage::getImage).collect(Collectors.toList());
+            for (OrderChildImage image : orderChildImages) {
+                if (image.getType().equals(1)) {
+                    loadPoundImages.add(documentFeign.getHost().getData() + image.getImage());
+                } else {
+                    unLoadPoundImages.add(documentFeign.getHost().getData() + image.getImage());
+                }
+            }
             param.setLoadPoundImages(loadPoundImages);
             param.setUnLoadPoundImages(unLoadPoundImages);
         }
@@ -199,10 +202,10 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         truckInfoDTO.setLoad(truckInfoFeignVo.getLoad());
         truckInfoDTO.setGrossMass(truckInfoFeignVo.getGrossMass() == null ? null : truckInfoFeignVo.getGrossMass().intValue());
         truckInfoDTO.setRoadTransportCertificateNo(truckInfoFeignVo.getRoadTransportCertificateNo());
-        truckInfoDTO.setLicenceImgMain(truckInfoFeignVo.getLicenceImgMain());
-        truckInfoDTO.setLicenceImgSecond(truckInfoFeignVo.getLicenceImgSecond());
-        truckInfoDTO.setLicenceImgSecondBack(truckInfoFeignVo.getLicenceImgSecondBack());
-        truckInfoDTO.setTransportLicenceImg(truckInfoFeignVo.getTransportLicenceImg());
+        truckInfoDTO.setLicenceImgMain(documentFeign.getHost() + truckInfoFeignVo.getLicenceImgMain());
+        truckInfoDTO.setLicenceImgSecond(documentFeign.getHost() + truckInfoFeignVo.getLicenceImgSecond());
+        truckInfoDTO.setLicenceImgSecondBack(documentFeign.getHost() + truckInfoFeignVo.getLicenceImgSecondBack());
+        truckInfoDTO.setTransportLicenceImg(documentFeign.getHost() + truckInfoFeignVo.getTransportLicenceImg());
         if (StringUtils.isNotBlank(truckInfoFeignVo.getPowerType())) {
             //"车辆燃料类型 1：柴油 2 天然气 3其他 4新能源/电"
             truckInfoDTO.setPowerType(PowerTypeEnum.Type.getCodeByName(truckInfoFeignVo.getPowerType()));
@@ -226,18 +229,18 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         dto.setCardStartTime(idCardVO.getCardStartTime());
         dto.setCardEndTime(idCardVO.getCardEndTime());
         dto.setCardLongTerm(idCardVO.getCardLongTerm());
-        dto.setCardFrontImg(idCardVO.getCardFaceImg());
-        dto.setCardBackImg(idCardVO.getCardBackImg());
+        dto.setCardFrontImg(documentFeign.getHost() + idCardVO.getCardFaceImg());
+        dto.setCardBackImg(documentFeign.getHost() + idCardVO.getCardBackImg());
         dto.setFaceCardImg(idCardVO.getCardFaceImg());
         dto.setLicenceNo(licenceVO.getLicenceNo());
         dto.setLicenseTime(licenceVO.getLicenceTime() == null ? null : DateUtils.formatDateTime(licenceVO.getLicenceTime()).get());
         dto.setLicenceClass(licenceVO.getLicenceClass());
-        dto.setLicenceImg(licenceVO.getLicenceImg());
-        dto.setLicenceBackImg(licenceVO.getLicenceBackImg());
+        dto.setLicenceImg(documentFeign.getHost() + licenceVO.getLicenceImg());
+        dto.setLicenceBackImg(documentFeign.getHost() + 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(licenceVO.getOccupationalLicenceImg());
+        dto.setOccupationalLicenceImg(documentFeign.getHost() + 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());
@@ -255,18 +258,18 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         dto.setCardStartTime(idCardVO.getCardStartTime());
         dto.setCardEndTime(idCardVO.getCardEndTime());
         dto.setCardLongTerm(idCardVO.getCardLongTerm());
-        dto.setCardFrontImg(idCardVO.getCardFaceImg());
-        dto.setCardBackImg(idCardVO.getCardBackImg());
+        dto.setCardFrontImg(documentFeign.getHost() + idCardVO.getCardFaceImg());
+        dto.setCardBackImg(documentFeign.getHost() + idCardVO.getCardBackImg());
         dto.setFaceCardImg(idCardVO.getCardFaceImg());
         dto.setLicenceNo(licenceVO.getLicenceNo());
         dto.setLicenseTime(licenceVO.getLicenceTime() == null ? null : DateUtils.formatDateTime(licenceVO.getLicenceTime()).get());
         dto.setLicenceClass(licenceVO.getLicenceClass());
-        dto.setLicenceImg(licenceVO.getLicenceImg());
-        dto.setLicenceBackImg(licenceVO.getLicenceBackImg());
+        dto.setLicenceImg(documentFeign.getHost() + licenceVO.getLicenceImg());
+        dto.setLicenceBackImg(documentFeign.getHost() + licenceVO.getLicenceBackImg());
         dto.setLicenceStartTime(licenceVO.getLicenceStartTime() == null ? null : DateUtils.formatDateTime(licenceVO.getLicenceStartTime()).get());
         dto.setLicenceEndTime(Optional.ofNullable(licenceVO.getLicenceEndTime()).isPresent() ? DateUtils.formatDateTime(licenceVO.getLicenceEndTime()).get() : "2099-12-31 00:00:00");
         dto.setOccupationalLicenceNo(licenceVO.getOccupationalLicenceNo());
-        dto.setOccupationalLicenceImg(licenceVO.getOccupationalLicenceImg());
+        dto.setOccupationalLicenceImg(documentFeign.getHost() + 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());
@@ -285,8 +288,8 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         dto.setIdCard(bankCardVO.getIdCard());
         dto.setBank(bankCardVO.getBank());
         dto.setBankCode(bankCardVO.getBankCode());
-        dto.setIdCardFrontImg(idCardVO.getCardFaceImg());
-        dto.setIdCardBackImg(idCardVO.getCardBackImg());
+        dto.setIdCardFrontImg(documentFeign.getHost() + idCardVO.getCardFaceImg());
+        dto.setIdCardBackImg(documentFeign.getHost() + idCardVO.getCardBackImg());
         param.setDriverBankInfoDTO(dto);
     }
 
@@ -301,8 +304,8 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         dto.setIdCard(bankCardVO.getIdCard());
         dto.setBank(bankCardVO.getBank());
         dto.setBankCode(bankCardVO.getBankCode());
-        dto.setIdCardFrontImg(idCardVO.getCardFaceImg());
-        dto.setIdCardBackImg(idCardVO.getCardBackImg());
+        dto.setIdCardFrontImg(documentFeign.getHost() + idCardVO.getCardFaceImg());
+        dto.setIdCardBackImg(documentFeign.getHost() + idCardVO.getCardBackImg());
         param.setTruckDriverBankInfoDTO(dto);
     }
 

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

@@ -172,7 +172,11 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementDriver.setSettlementFreight(detail.getSettlementFreight());
         settlementDriver.setInvoiceType(detail.getInvoiceType());
         settlementDriver.setSettlementPlatform(String.valueOf(SettlementPlatformEnum.Platform.MSL.getCode()));
-        settlementDriver.setStatus(SettlementDriverEnum.Status.WAIT_SETTLEMENT.getCode());
+        if (settlementDriver.getInvoiceType().equals(SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {
+            settlementDriver.setStatus(SettlementDriverEnum.Status.SETTLED.getCode());
+        } else {
+            settlementDriver.setStatus(SettlementDriverEnum.Status.WAIT_SETTLEMENT.getCode());
+        }
 
         settlementDriverDao.saveEntity(settlementDriver);
     }

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

@@ -99,11 +99,11 @@ public class SettlementServiceImpl implements SettlementService {
         settlementOwnerDetail.setInvoiceType(invoiceType);
         settlementDriverDetail.setInvoiceType(invoiceType);
 
-        // 网运单更新预付运费
-        if (Objects.equals(settlementOwnerDetail.getInvoiceType(), SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {
-            settlementOwnerDetail.setPrepayFreight(updatePrepayFreightPay(settlementOwnerDetail.getChildNo(),
-                    settlementOwnerDetail.getFreight(), settlementOwnerDetail.getLossFreight()));
-        }
+//        // 网运单更新预付运费
+//        if (Objects.equals(settlementOwnerDetail.getInvoiceType(), SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {
+//            settlementOwnerDetail.setPrepayFreight(updatePrepayFreightPay(settlementOwnerDetail.getChildNo(),
+//                    settlementOwnerDetail.getFreight(), settlementOwnerDetail.getLossFreight()));
+//        }
 
         settlementOwnerDetailDao.updateInvoiceType(settlementOwnerDetail);
         settlementDriverDetailDao.updateInvoiceTypeAndPrepayFreightFlag(settlementDriverDetail);
@@ -117,6 +117,7 @@ public class SettlementServiceImpl implements SettlementService {
      * 预付运费支付
      */
     private BigDecimal updatePrepayFreightPay(String childNo, BigDecimal freight, BigDecimal lossFreight){
+        //开票金额
         BigDecimal prepayFreight = freight.subtract(lossFreight);
         if (prepayFreight.compareTo(BigDecimal.ZERO) <= 0) {return BigDecimal.ZERO;}