bug修改

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

@@ -246,26 +246,28 @@ public class OtcTradeOrderController {
         List<VoyageRespVO> voyageRespVOList = BeanUtils.toBean(voyageList, VoyageRespVO.class);
         Map<Long, VoyageRespVO> voyageRespVoMap = CollectionUtils.convertMap(voyageRespVOList, VoyageRespVO::getId);
 
-        list.forEach(item -> {
-            MapUtils.findAndThen(shipMap, item.getShipId(), ship -> item.setShipName(ship.getName()));
-            MapUtils.findAndThen(countryMap, item.getId(), item::setCountryList);
-            MapUtils.findAndThen(roomModelMap, item.getId(), item::setRoomModelList);
-            MapUtils.findAndThen(orderTotalVoMap, item.getId(), totalVO -> {
-                item.setSummary(totalVO);
-                item.setPersonStat(totalVO.getAdultTotalNum() + "大" + (totalVO.getChildTotalNum() + totalVO.getBabyTotalNum()) + "小");
+        if (!list.isEmpty()) {
+            list.forEach(item -> {
+                MapUtils.findAndThen(shipMap, item.getShipId(), ship -> item.setShipName(ship.getName()));
+                MapUtils.findAndThen(countryMap, item.getId(), item::setCountryList);
+                MapUtils.findAndThen(roomModelMap, item.getId(), item::setRoomModelList);
+                MapUtils.findAndThen(orderTotalVoMap, item.getId(), totalVO -> {
+                    item.setSummary(totalVO);
+                    item.setPersonStat(totalVO.getAdultTotalNum() + "大" + (totalVO.getChildTotalNum() + totalVO.getBabyTotalNum()) + "小");
+                });
+                MapUtils.findAndThen(voyageRespVoMap, item.getVoyageId(), item::setVoyage);
+                if (item.getVisitors() != null && !item.getVisitors().isEmpty()) {
+                    item.setTotalPerson(item.getVisitors().size());
+                } else {
+                    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());
             });
-            MapUtils.findAndThen(voyageRespVoMap, item.getVoyageId(), item::setVoyage);
-            if (item.getVisitors() != null && !item.getVisitors().isEmpty()) {
-                item.setTotalPerson(item.getVisitors().size());
-            } else {
-                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());
-        });
+        }
         return success(page);
     }
 
@@ -279,7 +281,6 @@ public class OtcTradeOrderController {
     }
 
 
-
     @PostMapping("/window/paidOrderList")
     @Operation(summary = "win-已支付订单列表[分页]", description = "根据条件查询订单列表")
     @OperateLog(type = API)

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -1692,10 +1692,12 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             });
             for (TradeVistorReqVO tradeVistorReqVO : createVO.getTourist()) {
                 String cardNo = tradeVistorReqVO.getCardNo();
-                List<TradeVisitorDO> collect = oldvisitorDOList.stream().filter(v -> v.getCredentialNo().equals(cardNo)).collect(Collectors.toList());
-                if(collect.isEmpty()) {
-                    changedFields0 = "游客信息发生变更："+oldCardNo.get()+"->"+newCardNo.get();
-                    break;
+                if(!StringUtils.isEmpty(cardNo)) {
+                    List<TradeVisitorDO> collect = oldvisitorDOList.stream().filter(v -> StringUtils.equals(cardNo,v.getCredentialNo())).collect(Collectors.toList());
+                    if (collect.isEmpty()) {
+                        changedFields0 = "游客信息发生变更：" + oldCardNo.get() + "->" + newCardNo.get();
+                        break;
+                    }
                 }
             }
 
@@ -1772,9 +1774,11 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         List<PriceRoomModelTypeDO> roomModelTypes = priceRoomModelTypeService.getByIds(roomModelTypeIds);
         Map<Long, PriceRoomModelTypeDO> roomModelTypeMap = CollectionUtils.convertMap(roomModelTypes, PriceRoomModelTypeDO::getId);
         roomModelList.forEach(item -> {
-            PriceRoomModelTypeDO roomModelTypeDO = roomModelTypeMap.get(item.getRoomModelTypeId());
-            if (roomModelTypeDO != null) {
-                item.setRoomModelTypeName(roomModelTypeDO.getTypeName());
+            if(roomModelTypeMap!=null) {
+                PriceRoomModelTypeDO roomModelTypeDO = roomModelTypeMap.get(item.getRoomModelTypeId());
+                if (roomModelTypeDO != null) {
+                    item.setRoomModelTypeName(roomModelTypeDO.getTypeName());
+                }
             }
         });