Merge remote-tracking branch 'origin/v20.9_settlement_20240805' into v20.9_settlement_20240805

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

@@ -372,6 +372,28 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             return;
         }
 
+        // 同步失败
+        if (Objects.equals(result.getSyncStatus(), 2)) {
+
+            // 更新状态
+            settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.FAIL.getCode());
+            settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
+
+            SettlementOrderChildRisk settlementOrderChildRisk = new SettlementOrderChildRisk();
+            settlementOrderChildRisk.setChildNo(orderChild.getChildNo());
+            settlementOrderChildRisk.setTruckNo(orderChild.getTruckNo());
+            settlementOrderChildRisk.setDriverName(orderChild.getDriverName());
+            settlementOrderChildRisk.setDriverMobile(orderChild.getDriverMobile());
+            settlementOrderChildRisk.setGoodsName(orderChild.getGoodsName());
+            settlementOrderChildRisk.setInvoiceType(settlementOwnerDetail.getInvoiceType());
+            settlementOrderChildRisk.setPoundAuditTime(settlementOwnerDetail.getPoundAuditTime());
+            settlementOrderChildRisk.setRiskType(SettlementOrderChildRiskEnum.RiskType.SYNC_FAIL.getCode());
+            settlementOrderChildRisk.setRiskRemark(result.getSyncMsg());
+            settlementOrderChildRiskDao.saveEntity(settlementOrderChildRisk);
+
+            return;
+        }
+
         if (Objects.equals(result.getInvoiceStatus(), 1) ) {
             InvoicingStatusNotifyDTO invoicingStatusNotifyDTO = new InvoicingStatusNotifyDTO();
             invoicingStatusNotifyDTO.setChildNoList(Arrays.asList(mq.getChildNo()));
@@ -416,6 +438,28 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             return;
         }
 
+        // 同步失败
+        if (Objects.equals(result.getSyncStatus(), 2)) {
+
+            // 更新状态
+            settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.FAIL.getCode());
+            settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
+
+            SettlementOrderChildRisk settlementOrderChildRisk = new SettlementOrderChildRisk();
+            settlementOrderChildRisk.setChildNo(orderChild.getChildNo());
+            settlementOrderChildRisk.setTruckNo(orderChild.getTruckNo());
+            settlementOrderChildRisk.setDriverName(orderChild.getDriverName());
+            settlementOrderChildRisk.setDriverMobile(orderChild.getDriverMobile());
+            settlementOrderChildRisk.setGoodsName(orderChild.getGoodsName());
+            settlementOrderChildRisk.setInvoiceType(settlementOwnerDetail.getInvoiceType());
+            settlementOrderChildRisk.setPoundAuditTime(settlementOwnerDetail.getPoundAuditTime());
+            settlementOrderChildRisk.setRiskType(SettlementOrderChildRiskEnum.RiskType.SYNC_FAIL.getCode());
+            settlementOrderChildRisk.setRiskRemark(result.getSyncMsg());
+            settlementOrderChildRiskDao.saveEntity(settlementOrderChildRisk);
+
+            return;
+        }
+
         if (Objects.equals(result.getSettleStatus(), 1) ) {
 
             if (Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),QuotationEnum.PlatformFreightQuotationTaxType.NO.getCode())