提交 f741f24c authored 作者: 刘海泉's avatar 刘海泉

Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into dev

# Conflicts: # performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java
...@@ -84,14 +84,15 @@ public class OrderChildDtsListener { ...@@ -84,14 +84,15 @@ public class OrderChildDtsListener {
thirdpartySync(DtsMapConvertUtil.convert(dataTransportDTO.getAfterMap(), new OrderChildSyncMessage())); thirdpartySync(DtsMapConvertUtil.convert(dataTransportDTO.getAfterMap(), new OrderChildSyncMessage()));
if(Objects.equals(DtsOperationTypeEnum.INSERT.getCode(),dataTransportDTO.getOperationType().getCode())){ if(Objects.equals(DtsOperationTypeEnum.INSERT.getCode(),dataTransportDTO.getOperationType().getCode())){
syncPerformanceProgress(before,after,DtsOperationTypeEnum.INSERT.getCode());
//同步after数据 //同步after数据
log.info("新增:{}",after); log.info("新增:{}",after);
if(OrderChildEnum.SYNC_STATUS_lIST.contains(after.getStatus()) && !Objects.equals(before.getStatus(),after.getStatus())){ if(OrderChildEnum.SYNC_STATUS_lIST.contains(after.getStatus()) && !Objects.equals(before.getStatus(),after.getStatus())){
orderChildChangeAfter(after); orderChildChangeAfter(after);
} }
syncPerformanceProgress(before,after,DtsOperationTypeEnum.INSERT.getCode());
}else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){ }else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){
log.info("修改:{}",after); log.info("修改:{}",after);
syncPerformanceProgress(before,after,DtsOperationTypeEnum.INSERT.getCode());
if(OrderChildEnum.SYNC_STATUS_lIST.contains(after.getStatus()) && if(OrderChildEnum.SYNC_STATUS_lIST.contains(after.getStatus()) &&
(!Objects.equals(before.getStatus(),after.getStatus()) || (!Objects.equals(before.getStatus(),after.getStatus()) ||
!Objects.equals(before.getLoadNet(),after.getLoadNet())) || !Objects.equals(before.getLoadNet(),after.getLoadNet())) ||
...@@ -105,9 +106,7 @@ public class OrderChildDtsListener { ...@@ -105,9 +106,7 @@ public class OrderChildDtsListener {
log.info("DTS运单取消释放借款冻结金额"); log.info("DTS运单取消释放借款冻结金额");
applicationEventPublisher.publishEvent(new OrderChildCancelEvent(this, after.getChildNo())); applicationEventPublisher.publishEvent(new OrderChildCancelEvent(this, after.getChildNo()));
} }
syncPerformanceProgress(before,after,DtsOperationTypeEnum.INSERT.getCode());
afterLogicalProcessing(before,after); afterLogicalProcessing(before,after);
}else if(Objects.equals(DtsOperationTypeEnum.DELETE.getCode(),dataTransportDTO.getOperationType().getCode())){ }else if(Objects.equals(DtsOperationTypeEnum.DELETE.getCode(),dataTransportDTO.getOperationType().getCode())){
//数据删除 //数据删除
log.info("删除:{}",before); log.info("删除:{}",before);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论