xdd

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

@@ -754,8 +754,11 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         }
         Map<Long, FsStoreDelivers> byOrderIdWithTypeBatch = fsStoreDeliversMapper
                 .findByOrderIdWithTypeBatch(allOrderIds, 1);
-        Map<Long,LiveAfterSales> liveAfterSalesMap = liveAfterSalesMapper.findByOrderIds(recvIdList);
 
+        Map<Long,LiveAfterSales> liveAfterSalesMap = null;
+        if(CollectionUtils.isNotEmpty(recvIdList)){
+            liveAfterSalesMap = liveAfterSalesMapper.findByOrderIds(recvIdList);
+        }
 
         for (LiveOrderListVo order : liveOrders) {
             FsStoreDelivers delivers = byOrderIdWithTypeBatch.get(order.getOrderId());
@@ -773,9 +776,11 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                 order.setDeliveryStatus(null);
                 order.setDeliveryType(null);
             }
-            LiveAfterSales liveAfterSales = liveAfterSalesMap.get(order.getOrderId());
-            if(ObjectUtil.isNotNull(liveAfterSales)) {
-                order.setAfterSaleId(liveAfterSales.getId());
+            if(ObjectUtil.isNotNull(liveAfterSalesMap)){
+                LiveAfterSales liveAfterSales = liveAfterSalesMap.get(order.getOrderId());
+                if(ObjectUtil.isNotNull(liveAfterSales)) {
+                    order.setAfterSaleId(liveAfterSales.getId());
+                }
             }
         }
         if (liveOrders.isEmpty()) {