From 65593e353f99c50776b280ed4aec58a6946b7ad7 Mon Sep 17 00:00:00 2001 From: lulz1 Date: Tue, 27 Feb 2024 08:51:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/aggregates/order/HotelOrderDetail.java | 12 ------------ .../aggregates/order/HotelOrderDetailCustomer.java | 12 +++++++++++- .../order_detail/CTripOrderExtensionFactoryImpl.java | 2 +- .../order_detail/LYOrderExtensionFactoryImpl.java | 3 +++ 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/chint/domain/aggregates/order/HotelOrderDetail.java b/src/main/java/com/chint/domain/aggregates/order/HotelOrderDetail.java index a8e396a1..198835f1 100644 --- a/src/main/java/com/chint/domain/aggregates/order/HotelOrderDetail.java +++ b/src/main/java/com/chint/domain/aggregates/order/HotelOrderDetail.java @@ -111,18 +111,6 @@ public class HotelOrderDetail { @MappedCollection(idColumn = "hotel_order_detail_id", keyColumn = "hotel_order_detail_key") private List customers; - // 入住人性别 - private String gender; - - // 入住人姓名 - private String userName; - - // 入住人code - private String userCode; - - // 入住人手机号 - private String phone; - // 入离日期内差标 private String standardItems; diff --git a/src/main/java/com/chint/domain/aggregates/order/HotelOrderDetailCustomer.java b/src/main/java/com/chint/domain/aggregates/order/HotelOrderDetailCustomer.java index 06fe7c9e..b2aca982 100644 --- a/src/main/java/com/chint/domain/aggregates/order/HotelOrderDetailCustomer.java +++ b/src/main/java/com/chint/domain/aggregates/order/HotelOrderDetailCustomer.java @@ -2,13 +2,23 @@ package com.chint.domain.aggregates.order; import lombok.Data; +import org.springframework.data.annotation.Id; import org.springframework.data.relational.core.mapping.Table; @Data -@Table("hotel_order_detail") +@Table("hotel_order_detail_customer") public class HotelOrderDetailCustomer { + @Id private Long id; + // 入住人性别 + private String gender; + + // 入住人姓名 private String userName; + + // 入住人code private String userCode; + + // 入住人手机号 private String phone; } diff --git a/src/main/java/com/chint/domain/factoriy/order_detail/CTripOrderExtensionFactoryImpl.java b/src/main/java/com/chint/domain/factoriy/order_detail/CTripOrderExtensionFactoryImpl.java index 180391e2..c0500e98 100644 --- a/src/main/java/com/chint/domain/factoriy/order_detail/CTripOrderExtensionFactoryImpl.java +++ b/src/main/java/com/chint/domain/factoriy/order_detail/CTripOrderExtensionFactoryImpl.java @@ -94,7 +94,7 @@ public class CTripOrderExtensionFactoryImpl implements OrderExtensionFactory { String orderNo = hotelOrderInfoEntity.getOrderID(); Optional byOrderNo = orderDetailRepository.findByOrderNo(orderNo); String journeyNo = hotelOrderInfoEntity.getJourneyNo(); - RouteOrder routeOrder = routeRepository.findByOrderNo(journeyNo); + RouteOrder routeOrder = routeRepository.findByOrderNo(journeyNo).reloadStatus(); ApproveOrderNo approveOrderNo = routeOrder.getApproveOrderNo(); HotelOrderDetail hotelOrderDetail = new HotelOrderDetail(); diff --git a/src/main/java/com/chint/domain/factoriy/order_detail/LYOrderExtensionFactoryImpl.java b/src/main/java/com/chint/domain/factoriy/order_detail/LYOrderExtensionFactoryImpl.java index af182aa5..0bb43406 100644 --- a/src/main/java/com/chint/domain/factoriy/order_detail/LYOrderExtensionFactoryImpl.java +++ b/src/main/java/com/chint/domain/factoriy/order_detail/LYOrderExtensionFactoryImpl.java @@ -23,6 +23,9 @@ public class LYOrderExtensionFactoryImpl implements OrderExtensionFactory{ @Override public HotelOrderDetail createHotelOrderDetail(Object hotelOrderDetailData) { + + + return null; }