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

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

@@ -313,9 +313,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
                 return;
             }
-
             // 同步失败
-            if (Objects.equals(result.getSyncStatus(), 2)) {
+            else if (Objects.equals(result.getSyncStatus(), 2)) {
 
                 // 更新状态
                 settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.FAIL.getCode());
@@ -332,14 +331,17 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
                 settlementOrderChildRisk.setRiskType(SettlementOrderChildRiskEnum.RiskType.SYNC_FAIL.getCode());
                 settlementOrderChildRisk.setRiskRemark(result.getSyncMsg());
                 settlementOrderChildRiskDao.saveEntity(settlementOrderChildRisk);
-            }
 
-            // 更新状态
-            settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.SUCCESS.getCode());
-            settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
+                return;
+            }
+            else {
+                // 更新状态
+                settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.SUCCESS.getCode());
+                settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
 
-            // 发送mq （结算）
-            settlementMqService.settle(orderChild.getChildNo(), invoiceType, remark);
+                // 发送mq （结算）
+                settlementMqService.settle(orderChild.getChildNo(), invoiceType, remark);
+            }
         }catch (Exception e){
             log.info("结算获取状态失败， 运单号 {}",mq.getChildNo(),e);
         }