echo
/
route
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复我的行程未出现查询bug

This commit is contained in:
lulz1 2024-03-14 15:12:33 +08:00
parent ad7c367d00
commit f7bc528d38
5 changed files with 15 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chint/application/queryies/OrderDetailQuery.java
View File

@ -124,7 +124,7 @@ public class OrderDetailQuery {
}
if(ifNotStart != null && ifNotStart.equals(1)){
details = details.filter(it->it.getStartTime().isAfter(LocalDateTime.now()));
details = details.filter(it->it.getStartTime() != null).filter(it->it.getStartTime().isAfter(LocalDateTime.now()));
}
// if(ifStart != null && ifStart.equals(1)){

2
src/main/java/com/chint/domain/aggregates/order/ctrip/CtripFlightOrderDetail.java
View File

@ -95,7 +95,7 @@ public class CtripFlightOrderDetail implements Serializable {
if (flightOrderSettlementBaseInfo != null){
ctripFlightOrderDetail.setRecordId(flightOrderSettlementBaseInfo.getOrderID());
ctripFlightOrderDetail.setRecordId(flightOrderSettlementBaseInfo.getRecordID());
ctripFlightOrderDetail.setOrderId(flightOrderSettlementBaseInfo.getOrderID());
ctripFlightOrderDetail.setSequence(flightOrderSettlementBaseInfo.getSequence());
ctripFlightOrderDetail.setCreateTime(flightOrderSettlementBaseInfo.getCreateTime());

3
src/main/java/com/chint/domain/aggregates/order/ctrip/CtripHotelOrderDetail.java
View File

@ -76,7 +76,6 @@ public class CtripHotelOrderDetail implements Serializable {
public static CtripHotelOrderDetail changeInfo(OrderHotelResponse.SettlementDetail SettlementDetail) {
CtripHotelOrderDetail ctripHotelOrderDetail = new CtripHotelOrderDetail();
if (SettlementDetail != null){
ctripHotelOrderDetail.setRecordId(SettlementDetail.getRecordId());
ctripHotelOrderDetail.setOrderId(SettlementDetail.getOrderID());
ctripHotelOrderDetail.setAccountId(SettlementDetail.getAccountId());
@ -123,9 +122,7 @@ public class CtripHotelOrderDetail implements Serializable {
ctripHotelOrderDetail.setCancelServiceFee(SettlementDetail.getCancelServiceFee());
ctripHotelOrderDetail.setPayDiscountAmount(SettlementDetail.getPayDiscountAmount());
ctripHotelOrderDetail.setAverageRoomPrice(SettlementDetail.getAverageRoomPrice());
return ctripHotelOrderDetail;
// return BeanUtil.copyProperties(flightOrderSettlementBaseInfo,CtripFlightOrderDetail.class);
}
return null;

3
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/flight/FlightOrderInfoEntity.java
View File

@ -1,7 +1,6 @@
package com.chint.interfaces.rest.ctrip.dto.search.flight;
import com.chint.interfaces.rest.ly.dto.hotelorderdatapushbach.RefundInfo;
import lombok.Data;
import java.util.List;
@ -20,5 +19,5 @@ public class FlightOrderInfoEntity {
private List<PassengerInfo> PassengerInfo;
private List<FlightOrderFeeDetail> FlightOrderFeeDetailList;
private List<TripRecordInfo> TripRecordInfoList;
private FlightRefundInfo refundInfo;
private FlightRefundInfo RefundInfo;
}

44
src/main/java/com/chint/interfaces/rest/ctrip/order/CTripOrderDetailRequest.java
View File

@ -65,15 +65,10 @@ public class CTripOrderDetailRequest {
return getFlightOrder(formatter.format(localDateTime), formatter.format(localDateTime));
}
public OrderFlightResponse getFlightOrder(String datefrom,String dateto){
public OrderFlightResponse getFlightOrder(String dateFrom,String dateTo){
String dateFrom = datefrom;
String dateTo = dateto;
LocalDate date = LocalDate.parse(dateFrom);
String formattedDate = date.format(DateTimeFormatter.ofPattern("yyyyMM"));
System.out.println(formattedDate);
String dateFromNew = formattedDate + "01";
String substring = dateFrom.substring(0, 6);
String dateFromNew = substring + "01";
String batchNo = C_TRIP_CORP_ID + "_" + C_TRIP_ACCOUNT_ID + "_" + dateFromNew;
OrderFlightParam orderFlightParam = OrderFlightParam.of(
@ -99,15 +94,10 @@ public class CTripOrderDetailRequest {
return getHotelOrder(formatter.format(localDateTime), formatter.format(localDateTime));
}
public OrderHotelResponse getHotelOrder( String datefrom, String dateto){
public OrderHotelResponse getHotelOrder( String dateFrom, String dateTo){
String dateFrom = datefrom;
String dateTo = dateto;
LocalDate date = LocalDate.parse(dateFrom);
String formattedDate = date.format(DateTimeFormatter.ofPattern("yyyyMM"));
System.out.println(formattedDate);
String dateFromNew = formattedDate + "01";
String substring = dateFrom.substring(0, 6);
String dateFromNew = substring + "01";
String batchNo = C_TRIP_CORP_ID + "_" + C_TRIP_ACCOUNT_ID + "_" + dateFromNew;
OrderFlightParam orderFlightParam = OrderFlightParam.of(
@ -136,15 +126,10 @@ public class CTripOrderDetailRequest {
LocalDateTime localDateTime = LocalDateTime.now().minusDays(1L);
return getTrainOrder(formatter.format(localDateTime), formatter.format(localDateTime));
}
public OrderTrainResponse getTrainOrder(String datefrom, String dateto){
public OrderTrainResponse getTrainOrder(String dateFrom, String dateTo){
String dateFrom = datefrom;
String dateTo = dateto;
LocalDate date = LocalDate.parse(dateFrom);
String formattedDate = date.format(DateTimeFormatter.ofPattern("yyyyMM"));
System.out.println(formattedDate);
String dateFromNew = formattedDate + "01";
String substring = dateFrom.substring(0, 6);
String dateFromNew = substring + "01";
String batchNo = C_TRIP_CORP_ID + "_" + C_TRIP_ACCOUNT_ID + "_" + dateFromNew;
OrderFlightParam orderFlightParam = OrderFlightParam.of(
@ -172,15 +157,10 @@ public class CTripOrderDetailRequest {
LocalDateTime localDateTime = LocalDateTime.now().minusDays(1L);
return getCarOrder(formatter.format(localDateTime), formatter.format(localDateTime));
}
public OrderCarResponse getCarOrder(String datefrom, String dateto){
public OrderCarResponse getCarOrder(String dateFrom, String dateTo){
String dateFrom = datefrom;
String dateTo = dateto;
LocalDate date = LocalDate.parse(dateFrom);
String formattedDate = date.format(DateTimeFormatter.ofPattern("yyyyMM"));
System.out.println(formattedDate);
String dateFromNew = formattedDate + "01";
String substring = dateFrom.substring(0, 6);
String dateFromNew = substring + "01";
String batchNo = C_TRIP_CORP_ID + "_" + C_TRIP_ACCOUNT_ID + "_" + dateFromNew;
OrderFlightParam orderFlightParam = OrderFlightParam.of(