提交 6fef440d authored 作者: 杨启发's avatar 杨启发

Merge branch 'refs/heads/v20.4_exception_report_20240802' into test

# Conflicts: # performance-web/src/main/java/com/clx/performance/service/impl/PerformanceProgressServiceImpl.java
...@@ -288,10 +288,9 @@ public class PerformanceProgressServiceImpl implements PerformanceProgressServi ...@@ -288,10 +288,9 @@ public class PerformanceProgressServiceImpl implements PerformanceProgressServi
change = true; change = true;
//上报履约异常 //上报履约异常
if (StringUtils.isNotBlank(param.getPerformanceAbnormalReason())) {
FeignOrderVO orderVO = orderFeign.getOrderInfoFeign(item.getOrderNo()); FeignOrderVO orderVO = orderFeign.getOrderInfoFeign(item.getOrderNo());
boolean b = orderVO != null && Objects.equals(orderVO.getOrderSource(), SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode()); if (orderVO != null && Objects.equals(orderVO.getOrderSource(), SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode())) {
log.info("开始上报履约异常{}",b);
if (b) {
OpenCallBackClient openCallBackClient = thirdAppConfig.getOpenCallBackClient(SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode().toString()); OpenCallBackClient openCallBackClient = thirdAppConfig.getOpenCallBackClient(SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode().toString());
TransportExceptionReportMessage message = new TransportExceptionReportMessage(); TransportExceptionReportMessage message = new TransportExceptionReportMessage();
message.setOrderNo(item.getOrderNo()); message.setOrderNo(item.getOrderNo());
...@@ -306,6 +305,7 @@ public class PerformanceProgressServiceImpl implements PerformanceProgressServi ...@@ -306,6 +305,7 @@ public class PerformanceProgressServiceImpl implements PerformanceProgressServi
} }
} }
} }
}
if(!StringUtils.equals(item.getDispatchFollow(),param.getDispatchFollow())){ if(!StringUtils.equals(item.getDispatchFollow(),param.getDispatchFollow())){
PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(), PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
PerformanceProgressEnum.LogType.DISPATCH_FOLLOW, PerformanceProgressEnum.LogType.DISPATCH_FOLLOW,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论