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

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

@@ -24,6 +24,9 @@ public class SyncPerformanceProgress4OrderInfoListener {
     public void onMessage(String message) {
         log.info("监听到同步履约进度表---订单信息部分,消息内容{}", message);
         OrderInfoMessage data = JSONUtil.toBean(message, OrderInfoMessage.class);
+        log.info("1");
+
         performanceProgressService.dealPerformanceProgress4OrderInfo(data);
+        log.info("2");
     }
 }

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

@@ -270,6 +270,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void dealPerformanceProgress4OrderInfo(OrderInfoMessage data) {
+        log.info("2.1");
         //如果取消，删除履约进度表这条记录
         if(Objects.equals(data.getOrderStatus(),OrderEnum.Status.CANCELED.getCode())){
             performanceProgressDao.deleteByField(PerformanceProgress::getOrderNo,data.getOrderNo());
@@ -297,6 +298,8 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             //TODO 计算测算运费
 
         }
+
+        log.info("2.2");
         if(optional.isPresent()){
             item.setId(optional.get().getId());
             if(Objects.nonNull(data.getSendSystemAddressId()) &&
@@ -306,7 +309,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             }
             performanceProgressDao.updateEntityByKey(item);
         }else{
-
+            log.info("2.3");
             //查询最大的seq
             long seq = performanceProgressDao.getMaxSeq();
             item.setSeq(seq + 1);
@@ -333,6 +336,8 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             }catch (Exception e){
                 log.warn("订单计算重车运距失败，订单号:{},失败原因：{}",data.getOrderNo(), ExceptionUtils.getStackTrace(e));
             }
+
+            log.info("2.4");
             item.setOrderDistance(distance);
 
 
@@ -346,6 +351,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
                     + sendAddress.getAddress());
             item.setSeq(seq);
             performanceProgressDao.saveEntity(item);
+            log.info("2.5");
         }
     }