Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test

performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java

@@ -66,6 +66,12 @@ public class OrderChildDtsListener  {
                 if(OrderChildEnum.SYNC_STATUS_lIST.contains(after.getStatus()) && !Objects.equals(before.getStatus(),after.getStatus())){
                     orderChildChangeAfter(after);
                 }
+                if(OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())){
+                    //运单取消释放借款冻结金额
+                    log.info("DTS运单取消释放借款冻结金额");
+                    applicationEventPublisher.publishEvent(new OrderChildCancelEvent(this, after.getChildNo()));
+                }
+
             }else if(Objects.equals(DtsOperationTypeEnum.DELETE.getCode(),dataTransportDTO.getOperationType().getCode())){
                 //数据删除
                 log.info("删除:{}",before);
@@ -96,10 +102,6 @@ public class OrderChildDtsListener  {
             //如果订单是取消操作，同步给交易平台统一 10000 的code
             if(OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())){
                 after.setStatus(com.clx.open.sdk.enums.OrderChildEnum.Status.COMMON_CANCEL.getCode());
-                //运单取消释放借款冻结金额
-                log.info("DTS运单取消释放借款冻结金额");
-                applicationEventPublisher.publishEvent(new OrderChildCancelEvent(this, after.getChildNo()));
-
             }
             after.setLastFlag(ResultStatusEnum.NO.getCode());
             OpenCallBackClient client = new OpenCallBackClient(mslAppConfig.getUrl(),mslAppConfig.getAppId(),mslAppConfig.getSecret());