同步运单风控

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

@@ -202,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(documentFeign.getHost() + truckInfoFeignVo.getLicenceImgMain());
-        truckInfoDTO.setLicenceImgSecond(documentFeign.getHost() + truckInfoFeignVo.getLicenceImgSecond());
-        truckInfoDTO.setLicenceImgSecondBack(documentFeign.getHost() + truckInfoFeignVo.getLicenceImgSecondBack());
-        truckInfoDTO.setTransportLicenceImg(documentFeign.getHost() + truckInfoFeignVo.getTransportLicenceImg());
+        truckInfoDTO.setLicenceImgMain(documentFeign.getHost().getData() + truckInfoFeignVo.getLicenceImgMain());
+        truckInfoDTO.setLicenceImgSecond(documentFeign.getHost().getData() + truckInfoFeignVo.getLicenceImgSecond());
+        truckInfoDTO.setLicenceImgSecondBack(documentFeign.getHost().getData() + truckInfoFeignVo.getLicenceImgSecondBack());
+        truckInfoDTO.setTransportLicenceImg(documentFeign.getHost().getData() + truckInfoFeignVo.getTransportLicenceImg());
         if (StringUtils.isNotBlank(truckInfoFeignVo.getPowerType())) {
             //"车辆燃料类型 1：柴油 2 天然气 3其他 4新能源/电"
             truckInfoDTO.setPowerType(PowerTypeEnum.Type.getCodeByName(truckInfoFeignVo.getPowerType()));
@@ -229,18 +229,18 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         dto.setCardStartTime(idCardVO.getCardStartTime());
         dto.setCardEndTime(idCardVO.getCardEndTime());
         dto.setCardLongTerm(idCardVO.getCardLongTerm());
-        dto.setCardFrontImg(documentFeign.getHost() + idCardVO.getCardFaceImg());
-        dto.setCardBackImg(documentFeign.getHost() + idCardVO.getCardBackImg());
+        dto.setCardFrontImg(documentFeign.getHost().getData() + idCardVO.getCardFaceImg());
+        dto.setCardBackImg(documentFeign.getHost().getData() + 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(documentFeign.getHost() + licenceVO.getLicenceImg());
-        dto.setLicenceBackImg(documentFeign.getHost() + licenceVO.getLicenceBackImg());
+        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() + licenceVO.getOccupationalLicenceImg());
+        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());
@@ -258,18 +258,18 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         dto.setCardStartTime(idCardVO.getCardStartTime());
         dto.setCardEndTime(idCardVO.getCardEndTime());
         dto.setCardLongTerm(idCardVO.getCardLongTerm());
-        dto.setCardFrontImg(documentFeign.getHost() + idCardVO.getCardFaceImg());
-        dto.setCardBackImg(documentFeign.getHost() + idCardVO.getCardBackImg());
+        dto.setCardFrontImg(documentFeign.getHost().getData() + idCardVO.getCardFaceImg());
+        dto.setCardBackImg(documentFeign.getHost().getData() + 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(documentFeign.getHost() + licenceVO.getLicenceImg());
-        dto.setLicenceBackImg(documentFeign.getHost() + licenceVO.getLicenceBackImg());
+        dto.setLicenceImg(documentFeign.getHost().getData() + licenceVO.getLicenceImg());
+        dto.setLicenceBackImg(documentFeign.getHost().getData() + 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(documentFeign.getHost() + licenceVO.getOccupationalLicenceImg());
+        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());
@@ -288,8 +288,8 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         dto.setIdCard(bankCardVO.getIdCard());
         dto.setBank(bankCardVO.getBank());
         dto.setBankCode(bankCardVO.getBankCode());
-        dto.setIdCardFrontImg(documentFeign.getHost() + idCardVO.getCardFaceImg());
-        dto.setIdCardBackImg(documentFeign.getHost() + idCardVO.getCardBackImg());
+        dto.setIdCardFrontImg(documentFeign.getHost().getData() + idCardVO.getCardFaceImg());
+        dto.setIdCardBackImg(documentFeign.getHost().getData() + idCardVO.getCardBackImg());
         param.setDriverBankInfoDTO(dto);
     }
 
@@ -304,8 +304,8 @@ public class TransportSyncServiceImpl implements TransportSyncService {
         dto.setIdCard(bankCardVO.getIdCard());
         dto.setBank(bankCardVO.getBank());
         dto.setBankCode(bankCardVO.getBankCode());
-        dto.setIdCardFrontImg(documentFeign.getHost() + idCardVO.getCardFaceImg());
-        dto.setIdCardBackImg(documentFeign.getHost() + idCardVO.getCardBackImg());
+        dto.setIdCardFrontImg(documentFeign.getHost().getData() + idCardVO.getCardFaceImg());
+        dto.setIdCardBackImg(documentFeign.getHost().getData() + idCardVO.getCardBackImg());
         param.setTruckDriverBankInfoDTO(dto);
     }
 

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

@@ -133,7 +133,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         //生成车主结算单
         settlementDriverSave(settlementDriverDetail,settlementNo);
         //车主结算单自动支付
-        paySettlementDriver(settlementDriverDetail);
+        if (!settlementDriverDetail.getInvoiceType().equals(SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {
+            paySettlementDriver(settlementDriverDetail);
+        }
 
         // 更新结算单
         settlementOwnerDetail.setSettlementNo(settlementNo);
@@ -180,6 +182,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             settlementDriver.setStatus(SettlementDriverEnum.Status.WAIT_SETTLEMENT.getCode());
         }
 
+
+
         settlementDriverDao.saveEntity(settlementDriver);
     }