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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
lulz1 2024-03-17 16:35:17 +08:00
parent 9726f67317 f69bf78d16
commit 6498cdac76
20 changed files with 118 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/flight/BasicInfo.java
View File

@ -14,8 +14,8 @@ public class BasicInfo {
private String UID;
private String PreEmployName;
private String EmployeeID;
private int AccountID;
private int SubAccountID;
private Integer AccountID;
private Integer SubAccountID;
private String CorpPayType;
private String CreateTime;
private String FinishDate;
@ -23,7 +23,7 @@ public class BasicInfo {
private String FlightClass;
private String FlightWay;
private String Remarks;
private int PreBookDays;
private Integer PreBookDays;
private ServiceDetailInfo ServiceDetailInfo;
private String NBillingType;
private String TicketStatus;
@ -32,21 +32,21 @@ public class BasicInfo {
private String IsOfficialCard;
private String BookingChannel;
private String PlatformOrderID;
private double PayExchangeRate;
private Double PayExchangeRate;
private int OperationCode;
private double Amount;
private double TravelMoney;
private double ChangeAmount;
private double RefundAmount;
private double CCardPayFee;
private double SendTicketFee;
private double InsuranceFee;
private Double Amount;
private Double TravelMoney;
private Double ChangeAmount;
private Double RefundAmount;
private Double CCardPayFee;
private Double SendTicketFee;
private Double InsuranceFee;
private String PrepayType;
private double TotalServiceFee;
private Double TotalServiceFee;
private String Currency;
private double ForeignAmount;
private boolean Refundable;
private boolean Rebookable;
private Double ForeignAmount;
private Boolean Refundable;
private Boolean Rebookable;
private String JourneyID;
private String CostCenter;
private String CostCenter2;
@ -65,18 +65,18 @@ public class BasicInfo {
private Object ConfirmPersonCC2;
private String ConfirmType;
private String ConfirmType2;
private boolean PayMixed;
private Boolean PayMixed;
private List<PaymentItem> PaymentItemList;
private String IsOnline;
private String CorporationId;
private int DockingVendorPlatform;
private Integer DockingVendorPlatform;
private Object DockingVendorPlatformAccount;
private Object CorpDockingInfoList;
private Object AirlineCountryIdEqualAccount;
private String PreEmployNamePinYin;
private boolean CancelAble;
private double NewTotalServiceFee;
private double PostBasicServiceFee;
private double PostItineraryFee;
private Boolean CancelAble;
private Double NewTotalServiceFee;
private Double PostBasicServiceFee;
private Double PostItineraryFee;
private Object NewOrderIdList;
}

15
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/flight/ChangeInfo.java
View File

@ -2,16 +2,19 @@ package com.chint.interfaces.rest.ctrip.dto.search.flight;
import lombok.Data;
import org.apache.commons.math3.util.IntegerSequence;
import javax.sound.midi.Sequence;
@Data
public class ChangeInfo {
private int Sequence;
private int RebookId;
private Integer Sequence;
private Integer RebookId;
private String CPrepayType;
private String PassengerName;
private String CStatus;
private double CFee;
private double RebookServiceFee;
private Double CFee;
private Double RebookServiceFee;
private String RebookingTime;
private String RebookedTime;
private String OriTicketNo;
@ -60,13 +63,13 @@ public class ChangeInfo {
private int TaxDifferential;
private String TakeOffTimeUTC;
private String ArrivalTimeUTC;
private double PriceRate;
private Double PriceRate;
private String DepartureCountryCode;
private String ArrivalCountryCode;
private String FlightWay;
private String DepartureDistrictCode;
private String ArrivalDistrictCode;
private double CheckTicketPrice;
private Double CheckTicketPrice;
private String ShareFlightNo;
private String OriginalTicketNoSignCode;
private String PreTicketNoSignCode;

26
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/flight/FlightInfo.java
View File

@ -18,18 +18,18 @@ public class FlightInfo {
private String DPortName;
private String DPortCode;
private String Agreement;
private double Amount;
private double Price;
private double PrintPrice;
private double PriceRate;
private double StandardPrice;
private Double Amount;
private Double Price;
private Double PrintPrice;
private Double PriceRate;
private Double StandardPrice;
private boolean HasMeal;
private double OilFee;
private double Tax;
private Double OilFee;
private Double Tax;
private String Bindtype;
private int BindNum;
private double BindAmount;
private double ServerFee;
private Double BindAmount;
private Double ServerFee;
private int Subsidy;
private String AgeType;
@ -46,7 +46,7 @@ public class FlightInfo {
private String EndNotes;
private String Adtk;
private int FuelMileage;
private double EClassStandardPrice;
private Double EClassStandardPrice;
private String SpeicalClassTypeName;
private String SpeicalClassTypeDescription;
private String CraftType;
@ -65,8 +65,8 @@ public class FlightInfo {
private String PreBookReasonDesc;
private String LowFlight;
private String LowClass;
private double LowestPrice;
private double LowRate;
private Double LowestPrice;
private Double LowRate;
private String LowDTime;
private int Tpm;
private String ClassReason;
@ -81,7 +81,7 @@ public class FlightInfo {
private String SaleType;
private String PNR;
private int SegmentNo;
private double ItineraryFee;
private Double ItineraryFee;
// private List<ItineraryPassenger> ItineraryPassengers; // Assuming ItineraryPassenger is another class that you will define
// ... other fields

14
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/flight/FlightRefundDetail.java
View File

@ -16,20 +16,20 @@ public class FlightRefundDetail {
private String TicketNoSignCode;
private String Flight;
private String PassengerName;
private double RefundFee;
private double RefundRate;
private Double RefundFee;
private Double RefundRate;
private int RefundServiceFee;
private int Subsidy;
private long RebookingListID;
private long RebookingID;
private double UsedAmount;
private double UsedTax;
private Double UsedAmount;
private Double UsedTax;
private int UnusedRefundServiceFeeType;
private int UnusedRefundServiceFee;
private double RefundItineraryFee;
private Double RefundItineraryFee;
private String RefundInsuranceDetail;
private double TotalEmdAmount;
private Double TotalEmdAmount;
private String ShareFlightNo;
private double SupplierServiceFee;
private Double SupplierServiceFee;
private RefundFeeForCustomerInfo RefundFeeForCustomerInfo;
}

22
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/flight/FlightRefundInfo.java
View File

@ -15,8 +15,8 @@ import java.util.List;
public class FlightRefundInfo {
private String TokenNO;
private String Audited;
private double PayCustomerAmount;
private double PayCustomerTravelMoney;
private Double PayCustomerAmount;
private Double PayCustomerTravelMoney;
private String RefundAplyTime;
private String RefundAuditedTime;
private String RefundTime;
@ -47,20 +47,20 @@ class RefundFeeForCustomerInfo {
}
@Data
class UsedFeeInfo {
private double UsedPrintPrice;
private double UsedCost;
private double UsedTax;
private double UsedOilFee;
private double UsedDistributionPrice;
private double UsedAmount;
private Double UsedPrintPrice;
private Double UsedCost;
private Double UsedTax;
private Double UsedOilFee;
private Double UsedDistributionPrice;
private Double UsedAmount;
// Getters and Setters
}
@Data
class ServiceFeeInfo {
private double CtripServiceFee;
private double SupplierServiceFee;
private double CarrierServiceFee;
private Double CtripServiceFee;
private Double SupplierServiceFee;
private Double CarrierServiceFee;
// Getters and Setters
}

2
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/flight/ItemDetail.java
View File

@ -5,5 +5,5 @@ class ItemDetail {
private long PassengerId;
private String PassengerName;
private String FeeCode;
private double FeeAmount;
private Double FeeAmount;
}

2
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/flight/PaymentItem.java
View File

@ -7,6 +7,6 @@ import java.util.List;
@Data
public class PaymentItem {
private String PayType;
private double PayAmount;
private Double PayAmount;
private List<ItemDetail> ItemDetailList;
}

18
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/flight/ServiceDetailInfo.java
View File

@ -1,13 +1,13 @@
package com.chint.interfaces.rest.ctrip.dto.search.flight;
class ServiceDetailInfo {
private double BaseServiceFee;
private double BindServiceFee;
private double SpecialServiceFee;
private double UnWorkTimeServiceFee;
private double VIPServiceFee;
private double ItineraryFeeForRMB;
private double ItineraryFeeForForeign;
private double TechnicalServiceFee;
private double PresentInsuranceServiceFee;
private Double BaseServiceFee;
private Double BindServiceFee;
private Double SpecialServiceFee;
private Double UnWorkTimeServiceFee;
private Double VIPServiceFee;
private Double ItineraryFeeForRMB;
private Double ItineraryFeeForForeign;
private Double TechnicalServiceFee;
private Double PresentInsuranceServiceFee;
}

6
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/flight/TripRecordInfo.java
View File

@ -26,9 +26,9 @@ public class TripRecordInfo {
private String APortBuilding;
private int APortBuildingId;
private boolean OpenTranFlag;
private double PrintPrice;
private double Oil;
private double Tax;
private Double PrintPrice;
private Double Oil;
private Double Tax;
private String RecordNo;
private String AirlineRecordNo;
private boolean SharedFlag;

2
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/train/AccountPaymentInfo.java
View File

@ -9,7 +9,7 @@ public class AccountPaymentInfo {
private int AccountID;
private int SubAccountID;
private String OrderID;
private double Amount;
private Double Amount;
private String Category;
private String DataChange_CreateTime;
private String TrainRelatedNo;

2
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/train/FundAccountDealInfo.java
View File

@ -5,7 +5,7 @@ import lombok.Data;
@Data
public class FundAccountDealInfo {
private double Amount;
private Double Amount;
private String Category;
private long DealID;
// 可以根据需要继续添加更多的字段

2
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/train/OrderPayment.java
View File

@ -7,6 +7,6 @@ import lombok.Data;
public class OrderPayment {
private String PaymentType;
private String FeeCode;
private double FeeAmount;
private Double FeeAmount;
// 可以根据需要继续添加更多的字段
}

6
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/train/PassengerInfo.java
View File

@ -11,9 +11,9 @@ public class PassengerInfo {
private String IdentityNo;
private String Birthday;
private String TicketTypeName;
private int InsuranceProductID;
private int PurchaseNumber;
private int TicketPresentNum;
private Integer InsuranceProductID;
private Integer PurchaseNumber;
private Integer TicketPresentNum;
private String CostCenter1;
private String CostCenter2;
private String CostCenter3;

4
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/train/PaymentInfo.java
View File

@ -5,8 +5,8 @@ import lombok.Data;
// PaymentInfo内部类定义
@Data
public class PaymentInfo {
private double Amount;
private double ExchangeRate;
private Double Amount;
private Double ExchangeRate;
private String Currency;
private String DealType;
private String PayWayID;

22
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/train/SettlementInfoDetail.java
View File

@ -7,17 +7,17 @@ public class SettlementInfoDetail {
private long OrderTicketID;
private long PassengerID;
private String PassengerName;
private double TicketPrice;
private double InsuranceFee;
private double ServiceFee;
private double RefundTicketFee;
private double DeliverFee;
private double PaperTicketFee;
private double ChangeServiceFee;
private double GrabServiceFee;
private long DealID;
private Double TicketPrice;
private Double InsuranceFee;
private Double ServiceFee;
private Double RefundTicketFee;
private Double DeliverFee;
private Double PaperTicketFee;
private Double ChangeServiceFee;
private Double GrabServiceFee;
private Long DealID;
private String TicketInfoID;
private double AfterTakeTicketFee;
private double PurchaseFee;
private Double AfterTakeTicketFee;
private Double PurchaseFee;
// 可以根据需要继续添加更多的字段
}

4
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/train/TicketInfo.java
View File

@ -12,9 +12,9 @@ public class TicketInfo {
private String ArrivalCityName;
private String ArrivalDateTime;
private String FirstSeatTypeName;
private double TicketPrice;
private Double TicketPrice;
private String ElectronicOrderNo;
private double ServiceFee;
private Double ServiceFee;
private String TicketEntrance;
private String DealID;
// 可以根据需要继续添加更多的字段

22
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/train/TrainBasicInfo.java
View File

@ -8,18 +8,18 @@ public class TrainBasicInfo {
private String OrderID;
private String TripID;
private String EmployeeID;
private double OrderAmount;
private double DealAmount;
private int TotalQuantity;
private Double OrderAmount;
private Double DealAmount;
private Integer TotalQuantity;
private String Remark;
private boolean NeedInvoice;
private boolean IsIncludeInsuranceInvoice;
private int OrderTicketType;
private Boolean NeedInvoice;
private Boolean IsIncludeInsuranceInvoice;
private Integer OrderTicketType;
private String OrderTicketTypeDesc;
private String OrderStatus;
private String OrderType;
private String OrderTypeDesc;
private double ServiceFee;
private Double ServiceFee;
private String ContactName;
private String ContactMobile;
private String ContactEmail;
@ -28,17 +28,17 @@ public class TrainBasicInfo {
private String RefundTicketStatus;
private String PaymentType;
private String DataChange_CreateTime;
private double DeliverFee;
private double PaperTicketFee;
private Double DeliverFee;
private Double PaperTicketFee;
private String AccountName;
private String ConfirmPerson;
private String AuditResult;
private String AuditResultDesc;
private String OrderStatusName;
private double ChangeServiceFee;
private Double ChangeServiceFee;
private String ServerFrom;
private String CorporationId;
private boolean NeedBigInvoice;
private Boolean NeedBigInvoice;
private String CountryCode;
// 可以根据需要继续添加更多的字段
}

4
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/train/TrainCorpOrderInfo.java
View File

@ -6,8 +6,8 @@ import lombok.Data;
@Data
public class TrainCorpOrderInfo {
private String CorporationID;
private int AccountID;
private int SubAccountID;
private Integer AccountID;
private Integer SubAccountID;
private String CorpPayType;
private String CostCenter1;
private String CostCenter2;

2
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/train/TrainTicketDeliveryInfo.java
View File

@ -5,7 +5,7 @@ import lombok.Data;
@Data
public class TrainTicketDeliveryInfo {
private String OrderID;
private int AreaID;
private Integer AreaID;
private String Province;
private String City;
private String Area;

17
src/test/java/com/chint/LYTest.java
View File

@ -802,10 +802,10 @@ public class LYTest {
// System.out.println(json);
// TrainDetailResponse trainDetailResponse = lySearchRequest.getTrainOrderDetail("DT24031466762140980");
// Gson gson = new Gson();
// String json = gson.toJson(trainDetailResponse);
// System.out.println(json);
TrainDetailResponse trainDetailResponse = lySearchRequest.getTrainOrderDetail(" DTC24031767013846252");
Gson gson = new Gson();
String json = gson.toJson(trainDetailResponse);
System.out.println(json);
// HotelDetailResponse trainDetailResponse = lySearchRequest.getHotelOrderDetail("HO20240314114500180104");
// Gson gson = new Gson();
@ -813,12 +813,11 @@ public class LYTest {
// System.out.println(json);
// 30352884087
CarDetailResponse carDetailResponse = lySearchRequest.getCarDetailResponse("30352884087");
Gson gson = new Gson();
String json = gson.toJson(carDetailResponse);
System.out.println(json);
// CarDetailResponse carDetailResponse = lySearchRequest.getCarDetailResponse("30352884087");
// Gson gson = new Gson();
// String json = gson.toJson(carDetailResponse);
// System.out.println(json);
}
@Test