Merge remote-tracking branch 'origin/test' into test

performance-web/src/main/java/com/clx/performance/job/WeighingOderPictureJob.java

@@ -66,10 +66,6 @@ public class WeighingOderPictureJob{
         status.add(OrderChildEnum.Status.UNSETTLE.getCode());
         //查询指定运单数据
         List<OrderChild> orderChilds = orderChildDao.listChidNosByStatus(status);
-        orderChilds =new ArrayList<>();
-        OrderChild orderChild2 = new OrderChild();
-        orderChild2.setChildNo("CYD2024082815893659");
-        orderChilds.add(orderChild2);
         log.info("查询运单数据返回：{}",orderChilds);
 
         //查询运单下的电子磅单数据

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

@@ -96,23 +96,30 @@ public class OrderChildDtsListener  {
                     orderChildChangeAfter(after);
                 }
             }else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){
-                log.info("修改:{}",after);
+                log.info("修改:{}",JSON.toJSONString(after));
                 syncPerformanceProgress(before,after,DtsOperationTypeEnum.UPDATE.getCode());
+                log.info("修改1, childNo:{}", before.getChildNo());
                 if(OrderChildEnum.SYNC_STATUS_lIST.contains(after.getStatus()) &&
                         (!Objects.equals(before.getStatus(),after.getStatus()) ||
                          !Objects.equals(before.getLoadNet(),after.getLoadNet())) ||
                          !Objects.equals(before.getUnloadNet(),after.getUnloadNet()) ||
                          !Objects.equals(before.getPoundStatus(),after.getPoundStatus())
                         ){
+                    log.info("修改2, childNo:{}", before.getChildNo());
                     orderChildChangeAfter(after);
+                    log.info("修改3, childNo:{}", before.getChildNo());
                 }
+                log.info("修改4, childNo:{}", before.getChildNo());
                 if(OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())){
+                    log.info("修改5, childNo:{}", before.getChildNo());
                     //运单取消释放借款冻结金额
                     log.info("DTS运单取消释放借款冻结金额");
                     applicationEventPublisher.publishEvent(new OrderChildCancelEvent(this, after.getChildNo()));
+                    log.info("修改6, childNo:{}", before.getChildNo());
                 }
+                log.info("修改7, childNo:{}", before.getChildNo());
                 afterLogicalProcessing(before,after);
-
+                log.info("修改8, childNo:{}", before.getChildNo());
             }else if(Objects.equals(DtsOperationTypeEnum.DELETE.getCode(),dataTransportDTO.getOperationType().getCode())){
                 //数据删除
                 log.info("删除:{}",before);