Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test

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

@@ -380,7 +380,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     @Override
     public List<OrderChild> selectInTransitOrderChildLtUnsettle(String orderNo) {
         return baseMapper.selectList(lQrWrapper().eq(OrderChild::getOrderNo, orderNo)
-                .lt(OrderChild::getStatus, OrderChildEnum.Status.UNLOAD.getCode())
+                .lt(OrderChild::getStatus, OrderChildEnum.Status.UNSETTLE.getCode())
         );
     }
 

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

@@ -2045,7 +2045,7 @@ public class OrderChildServiceImpl implements OrderChildService {
 
     @Override
     public List<OrderChild> selectInTransitOrderChildLtUnsettle(String orderNo) {
-        return orderChildDao.selectInTransitOrderChild(orderNo);
+        return orderChildDao.selectInTransitOrderChildLtUnsettle(orderNo);
     }