xdd

fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -744,21 +744,13 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         List<Long> allOrderIds = liveOrders.stream().map(LiveOrderListVo::getOrderId)
                 .filter(Objects::nonNull).collect(Collectors.toList());
 
-        List<Long> recvIdList = liveOrders.stream().filter(e -> Objects.equals(e.getStatus(), 3))
-                .map(LiveOrderListVo::getOrderId)
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-
         if(CollectionUtils.isEmpty(allOrderIds)) {
             return Collections.emptyList();
         }
         Map<Long, FsStoreDelivers> byOrderIdWithTypeBatch = fsStoreDeliversMapper
                 .findByOrderIdWithTypeBatch(allOrderIds, 1);
 
-        Map<Long,LiveAfterSales> liveAfterSalesMap = null;
-        if(CollectionUtils.isNotEmpty(recvIdList)){
-            liveAfterSalesMap = liveAfterSalesMapper.findByOrderIds(recvIdList);
-        }
+        Map<Long,LiveAfterSales> liveAfterSalesMap = liveAfterSalesMapper.findByOrderIds(allOrderIds);
 
         for (LiveOrderListVo order : liveOrders) {
             FsStoreDelivers delivers = byOrderIdWithTypeBatch.get(order.getOrderId());