解决冲突

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -688,14 +688,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
     }
 
-    @Override
-    public List<OrderChild> listBeforeUnloadOrderChild(LocalDateTime startTime,LocalDateTime endTime) {
-        return list(lQrWrapper()
-                .lt(OrderChild :: getStatus, OrderChildEnum.Status.ARRIVE_RECEIVE.getCode())
-                .ge(OrderChild :: getCreateTime,startTime)
-                .le(OrderChild :: getCreateTime,endTime)
-        );
-    }
+
 
     @Override
     public List<OrderChild> listChidNosByStatus(List<Integer> status) {

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

@@ -75,8 +75,6 @@ public class OrderChildDtsListener  {
     private final RabbitTemplate rabbitTemplate;
 
     private final OrderGoodsDao orderGoodsDao;
-    private final TruckFeign truckFeign;
-    private final OrderChildImageDao orderChildImageDao;