Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into test

performance-web/src/main/java/com/clx/performance/component/OrderCancelComponent.java

@@ -161,12 +161,14 @@ public class OrderCancelComponent implements InitializingBean {
                 throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "参数有误");
 
         }
+
+        this.breakContractSettlementOwner(orderNo, orderStatusCode);
+
         log.info("执行货主取消订单更改状态");
         if (!orderFeign.updateOrderStatusByOrderNo(orderNo, orderStatusCode).succeed()) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "货主取消订单失败,原因：远程调用取消订单失败");
         }
 
-        this.breakContractSettlementOwner(orderNo, orderStatusCode);
 
     }
 
@@ -247,7 +249,7 @@ public class OrderCancelComponent implements InitializingBean {
     public void breakContractSettlementOwner(String orderNo, Integer updateStatus) {
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
         Integer orderStatus = orderInfoFeign.getOrderStatus();
-        log.info("执行处理违约,订单号：{}, updateStatus:{}", orderNo, updateStatus);
+        log.info("执行处理违约,订单号：{}, updateStatus:{}, 订单状态{}", orderNo, updateStatus, orderStatus);
         if (OrderEnum.Status.COMPLETED.getCode().equals(updateStatus) || statusCodeMap.containsKey(orderStatus)) {
             try {
                 breakContractSettlementOwnerService.saveSettlementOwnerForCancelOrder(orderNo);