Merge branch 'refs/heads/v20.9_settlement_20240805' into test

performance-web/src/main/java/com/clx/performance/listener/excel/InvoiceDataListener.java

@@ -59,10 +59,10 @@ public class InvoiceDataListener extends AnalysisEventListener<InvoiceData> {
         // 可在此进行表头校验等操作
         //模板有3列，模板第1列是运单编号，第2列是开票标识，第3列是开票金额，校验上传的Excel是否是这个模板
         if (headMap.size() != 3) {
-            throw new ServiceSystemException(DATA_NOT_FIND,"上传文件格式错误");
+            throw new ServiceSystemException(DATA_NOT_FIND,"上传文件不匹配，请以文件模板为准");
         }
         if (!headMap.get(0).equals("运单编号") || !headMap.get(1).equals("开票标识") || !headMap.get(2).equals("开票金额")) {
-            throw new ServiceSystemException(DATA_NOT_FIND,"上传文件格式错误");
+            throw new ServiceSystemException(DATA_NOT_FIND,"上传文件不匹配，请以文件模板为准");
         }
     }
 }

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())