Merge remote-tracking branch 'origin/v6.4_transportation_20231110' into…

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -52,7 +52,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     IPage<PageCarrierOrderChildVO> pageCarrierOrderChildList(PageCarrierOrderChildParam param);
 
-    Optional<List<OrderChild>> getOrderChildInfoByOrderGoodsNo(String childNo);
+    Optional<List<OrderChild>> getOrderChildInfoByOrderGoodsNo(String orderGoodsNo);
 
     OrderChild getGoingLatestOrderChild(Long driverUserNo);
 

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

@@ -457,6 +457,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         LambdaQueryWrapper<OrderChild> query = new LambdaQueryWrapper<>();
         query.eq(OrderChild :: getSendSystemAddressId,sendSystemAddressId);
         query.eq(OrderChild :: getReceiveSystemAddressId,receiveSystemAddressId);
+        query.le(OrderChild::getStatus, OrderChildEnum.Status.COMPLETE.getCode());
         query.orderByDesc(OrderChild :: getCreateTime);
         query.last("limit 1");
         OrderChild child = baseMapper.selectOne(query);

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

@@ -364,7 +364,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         }
 
         String orderGoodsNo = orderGoodsParams.getOrderGoodsNo();
-        List<OrderChild> orderChildList = orderChildDao.getOrderChildInfoByOrderGoodsNo(orderGoodsNo).get();
+        List<OrderChild> orderChildList = orderChildDao.selectListByOrderGoodsNo(orderGoodsNo);
         boolean pendingOrderWayFlag = CollectionUtils.isNotEmpty(orderChildList);
 
         if (pendingOrderWayFlag) {