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

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

@@ -321,7 +321,13 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
                 settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.FAIL.getCode());
                 settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
 
-                SettlementOrderChildRisk settlementOrderChildRisk = new SettlementOrderChildRisk();
+                SettlementOrderChildRisk settlementOrderChildRisk = settlementOrderChildRiskDao.findLastByChildNo(mq.getChildNo()).orNull();
+                if (settlementOrderChildRisk!=null
+                        && Objects.equals(settlementOrderChildRisk.getStatus(), SettlementOrderChildRiskEnum.Status.INIT.getCode())){
+                    return;
+                }
+                settlementOrderChildRisk = new SettlementOrderChildRisk();
+
                 settlementOrderChildRisk.setChildNo(orderChild.getChildNo());
                 settlementOrderChildRisk.setTruckNo(orderChild.getTruckNo());
                 settlementOrderChildRisk.setDriverName(orderChild.getDriverName());
@@ -379,7 +385,12 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.FAIL.getCode());
             settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
 
-            SettlementOrderChildRisk settlementOrderChildRisk = new SettlementOrderChildRisk();
+            SettlementOrderChildRisk settlementOrderChildRisk = settlementOrderChildRiskDao.findLastByChildNo(mq.getChildNo()).orNull();
+            if (settlementOrderChildRisk!=null
+                    && Objects.equals(settlementOrderChildRisk.getStatus(), SettlementOrderChildRiskEnum.Status.INIT.getCode())){
+                return;
+            }
+            settlementOrderChildRisk = new SettlementOrderChildRisk();
             settlementOrderChildRisk.setChildNo(orderChild.getChildNo());
             settlementOrderChildRisk.setTruckNo(orderChild.getTruckNo());
             settlementOrderChildRisk.setDriverName(orderChild.getDriverName());
@@ -445,7 +456,12 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.FAIL.getCode());
             settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
 
-            SettlementOrderChildRisk settlementOrderChildRisk = new SettlementOrderChildRisk();
+            SettlementOrderChildRisk settlementOrderChildRisk = settlementOrderChildRiskDao.findLastByChildNo(mq.getChildNo()).orNull();
+            if (settlementOrderChildRisk!=null
+                    && Objects.equals(settlementOrderChildRisk.getStatus(), SettlementOrderChildRiskEnum.Status.INIT.getCode())){
+                return;
+            }
+            settlementOrderChildRisk = new SettlementOrderChildRisk();
             settlementOrderChildRisk.setChildNo(orderChild.getChildNo());
             settlementOrderChildRisk.setTruckNo(orderChild.getTruckNo());
             settlementOrderChildRisk.setDriverName(orderChild.getDriverName());