订单航次游客信息导出

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/OtcTradeOrderController.java

@@ -280,10 +280,12 @@ public class OtcTradeOrderController {
                     item.setTotalPerson(0);
                 }
 
-                Map<String, List<TradeOrderRoomModelVO>> roomDesc = item.getRoomModelList().stream().collect(Collectors.groupingBy(p -> p.getRoomModelName() + "(" + p.getFloor() + "F)"));
-                AtomicReference<String> roomDescStr = new AtomicReference<>("");
-                roomDesc.forEach((key, value) -> roomDescStr.set(roomDescStr.get() + " " + value.size() + "*" + key));
-                item.setRoomModelDetails(roomDescStr.get().trim());
+                if(!item.getRoomModelList().isEmpty()) {
+                    Map<String, List<TradeOrderRoomModelVO>> roomDesc = item.getRoomModelList().stream().collect(Collectors.groupingBy(p -> p.getRoomModelName() + "(" + p.getFloor() + "F)"));
+                    AtomicReference<String> roomDescStr = new AtomicReference<>("");
+                    roomDesc.forEach((key, value) -> roomDescStr.set(roomDescStr.get() + " " + value.size() + "*" + key));
+                    item.setRoomModelDetails(roomDescStr.get().trim());
+                }
             });
         }
         return success(page);