新下单流程优化

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

@@ -1923,6 +1923,23 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         List<ShipTradeOrderCreateReqVO.Visitor> visitorList = new ArrayList<>();
         for (TradeVistorReqVO tradeVistorReqVO : createVO.getTourist()) {
             ShipTradeOrderCreateReqVO.Visitor visitor = getVisitor1(tradeVistorReqVO);
+            visitor.setName(tradeVistorReqVO.getName());
+            visitor.setVid(tradeVistorReqVO.getId());
+            visitor.setMobile(tradeVistorReqVO.getMobile());
+            visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
+            visitor.setCredentialType(tradeVistorReqVO.getCardType());
+            visitor.setYczz(tradeVistorReqVO.getYichang());
+            visitor.setCqzz(tradeVistorReqVO.getChongqing());
+            visitor.setRoomId(tradeVistorReqVO.getRoomId());
+            visitor.setAge(tradeVistorReqVO.getAge());
+            visitor.setBirthday(tradeVistorReqVO.getBirthday());
+            visitor.setGender(tradeVistorReqVO.getGender());
+            visitor.setNationality(tradeVistorReqVO.getNationality());
+            visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
+            visitor.setType(tradeVistorReqVO.getType());
+            visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
+            visitor.setRoomModelId(tradeVistorReqVO.getRoomModelId());
+            visitor.setFloor(tradeVistorReqVO.getFloor());
             visitorList.add(visitor);
         }
         orderDetail.setVisitorList(visitorList);
@@ -2462,19 +2479,19 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         }
         tradeOrderVO.setOrderDO(tradeOrderDO);
         //设置国籍数据
-        List<TradeOrderCountryDO> country = tradeOrderCountryMapper.selectListByOrderId(orderId);
+        List<TradeOrderCountryDO> country = tradeOrderCountryMapper.selectListByOrderId(tradeOrderDO.getId());
         tradeOrderVO.setCountryData(country);
         //获取订单门票信息
         List<TradeDetailRespVO> detailList = tradeDetailMapper.getOrderIdDetail(tradeOrderDO.getId());
         tradeOrderVO.setTradeDetailDOList(detailList);
         //设置订单汇总数据
-        TradeOrderTotalDO tradeOrderTotalDO = tradeOrderTotalMapper.selectOne(TradeOrderTotalDO::getOldOrderId, orderId);
+        TradeOrderTotalDO tradeOrderTotalDO = tradeOrderTotalMapper.selectOne(TradeOrderTotalDO::getOldOrderId, tradeOrderDO.getId());
         tradeOrderVO.setSummary(tradeOrderTotalDO);
 
-        OrderJzDO orderJzDO = orderJzMapper.selectOne(OrderJzDO::getOrderId, orderId);
+        OrderJzDO orderJzDO = orderJzMapper.selectOne(OrderJzDO::getOrderId, tradeOrderDO.getId());
         tradeOrderVO.setOrderJzDO(orderJzDO);
 
-        List<TradeOrderRoomModelDO> roomModelDOList = tradeOrderRoomModelMapper.selectList(TradeOrderRoomModelDO::getOrderId, orderId);
+        List<TradeOrderRoomModelDO> roomModelDOList = tradeOrderRoomModelMapper.selectList(TradeOrderRoomModelDO::getOrderId, tradeOrderDO.getId());
         tradeOrderVO.setRoomModelList(roomModelDOList);
         return CommonResult.success(tradeOrderVO);
     }