diff --git a/src/main/java/com/chint/interfaces/rest/ly/dto/applyordersync/AOSResult.java b/src/main/java/com/chint/interfaces/rest/ly/dto/applyordersync/AOSResult.java deleted file mode 100644 index 0d2f4f0c..00000000 --- a/src/main/java/com/chint/interfaces/rest/ly/dto/applyordersync/AOSResult.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.chint.interfaces.rest.ly.dto.applyordersync; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 返回结果 - */ -@NoArgsConstructor -@AllArgsConstructor -@Data -public class AOSResult { - private Boolean success;//返回结果 - private String errorCode;//返回类型 - private String errorMessage;//返回信息 - private String data;//差旅单信息 - private String travelApplyNo;//同程出差单号 - private Integer errorType;//错误类型 -} diff --git a/src/main/java/com/chint/interfaces/rest/ly/dto/hotelorderdatapushbach/Result.java b/src/main/java/com/chint/interfaces/rest/ly/dto/commonresult/Result.java similarity index 92% rename from src/main/java/com/chint/interfaces/rest/ly/dto/hotelorderdatapushbach/Result.java rename to src/main/java/com/chint/interfaces/rest/ly/dto/commonresult/Result.java index 1a737535..ba7311c2 100644 --- a/src/main/java/com/chint/interfaces/rest/ly/dto/hotelorderdatapushbach/Result.java +++ b/src/main/java/com/chint/interfaces/rest/ly/dto/commonresult/Result.java @@ -1,4 +1,4 @@ -package com.chint.interfaces.rest.ly.dto.hotelorderdatapushbach; +package com.chint.interfaces.rest.ly.dto.commonresult; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/chint/interfaces/rest/ly/dto/flydatapushback/Notification.java b/src/main/java/com/chint/interfaces/rest/ly/dto/flydatapushback/Notification.java new file mode 100644 index 00000000..56ef12e5 --- /dev/null +++ b/src/main/java/com/chint/interfaces/rest/ly/dto/flydatapushback/Notification.java @@ -0,0 +1,18 @@ +package com.chint.interfaces.rest.ly.dto.flydatapushback; + +import com.chint.interfaces.rest.ly.dto.ticketpush.NotifyData; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@Data +@AllArgsConstructor +public class Notification { + private OrderDetails orderDetails; + private int notifyType; //推送类型 + private int subNotifyType; //推送子类型 + private long notifyTime; //推送时间戳 + private String sign; //推送签名 + private String soleKey; // 推送唯一秘钥 +} diff --git a/src/main/java/com/chint/interfaces/rest/ly/dto/flydatapushback/Result.java b/src/main/java/com/chint/interfaces/rest/ly/dto/flydatapushback/Result.java deleted file mode 100644 index f41b365c..00000000 --- a/src/main/java/com/chint/interfaces/rest/ly/dto/flydatapushback/Result.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.chint.interfaces.rest.ly.dto.flydatapushback; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@AllArgsConstructor -@Data -@NoArgsConstructor -public class Result { - private String success; - private String errorCode; - private String errorMessage; - private T data; - - public Result(String success, T data) { - this.success = success; - this.data = data; - } - - public Result(String errorCode, String errorMessage) { - this.errorCode = errorCode; - this.errorMessage = errorMessage; - } - public static Result Success(String success, T data) { - return new Result(success,data); - } - - public static Result error(String errorCode, String errorMessage) { - return new Result(errorCode,errorMessage); - } - -} diff --git a/src/main/java/com/chint/interfaces/rest/ly/dto/hotelorderdatapushbach/Notification.java b/src/main/java/com/chint/interfaces/rest/ly/dto/hotelorderdatapushbach/Notification.java new file mode 100644 index 00000000..15baa8bf --- /dev/null +++ b/src/main/java/com/chint/interfaces/rest/ly/dto/hotelorderdatapushbach/Notification.java @@ -0,0 +1,18 @@ +package com.chint.interfaces.rest.ly.dto.hotelorderdatapushbach; + +import com.chint.interfaces.rest.ly.dto.ticketpush.NotifyData; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@Data +@AllArgsConstructor +public class Notification { + private OrderInfo orderInfo; + private int notifyType; //推送类型 + private int subNotifyType; //推送子类型 + private long notifyTime; //推送时间戳 + private String sign; //推送签名 + private String soleKey; // 推送唯一秘钥 +} diff --git a/src/main/java/com/chint/interfaces/rest/ly/dto/ticketpush/Notification.java b/src/main/java/com/chint/interfaces/rest/ly/dto/ticketpush/Notification.java new file mode 100644 index 00000000..28f865c7 --- /dev/null +++ b/src/main/java/com/chint/interfaces/rest/ly/dto/ticketpush/Notification.java @@ -0,0 +1,18 @@ +package com.chint.interfaces.rest.ly.dto.ticketpush; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@Data +@AllArgsConstructor +public class Notification { + private NotifyData notifyData; + private int notifyType; //推送类型 + private int subNotifyType; //推送子类型 + private long notifyTime; //推送时间戳 + private String sign; //推送签名 + private String soleKey; // 推送唯一秘钥 + private boolean isEncrypt; //是否加密 +} diff --git a/src/main/java/com/chint/interfaces/rest/ly/dto/ticketpush/NotifyData.java b/src/main/java/com/chint/interfaces/rest/ly/dto/ticketpush/NotifyData.java new file mode 100644 index 00000000..73ff57a7 --- /dev/null +++ b/src/main/java/com/chint/interfaces/rest/ly/dto/ticketpush/NotifyData.java @@ -0,0 +1,17 @@ +package com.chint.interfaces.rest.ly.dto.ticketpush; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@NoArgsConstructor +@Data +@AllArgsConstructor +public class NotifyData { + private String orderSerialNo;//订单号 + private String ticketNo;//票号 + private List ticketRecordSegmentList; + +} diff --git a/src/main/java/com/chint/interfaces/rest/ly/dto/ticketpush/TicketRecordSegment.java b/src/main/java/com/chint/interfaces/rest/ly/dto/ticketpush/TicketRecordSegment.java new file mode 100644 index 00000000..e5ccb90c --- /dev/null +++ b/src/main/java/com/chint/interfaces/rest/ly/dto/ticketpush/TicketRecordSegment.java @@ -0,0 +1,14 @@ +package com.chint.interfaces.rest.ly.dto.ticketpush; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@Data +@AllArgsConstructor +public class TicketRecordSegment { + private String flightNo;//航班号 + private int status;//票状态 + private String statusText;//票状态描述 +} diff --git a/src/main/java/com/chint/interfaces/rest/ly/dto/trainorderdatapushback/Notification.java b/src/main/java/com/chint/interfaces/rest/ly/dto/trainorderdatapushback/Notification.java new file mode 100644 index 00000000..594c45ca --- /dev/null +++ b/src/main/java/com/chint/interfaces/rest/ly/dto/trainorderdatapushback/Notification.java @@ -0,0 +1,18 @@ +package com.chint.interfaces.rest.ly.dto.trainorderdatapushback; + +import com.chint.interfaces.rest.ly.dto.ticketpush.NotifyData; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@Data +@AllArgsConstructor +public class Notification { + private NotifyData notifyData; + private int notifyType; //推送类型 + private int subNotifyType; //推送子类型 + private long notifyTime; //推送时间戳 + private String sign; //推送签名 + private String soleKey; // 推送唯一秘钥 +} diff --git a/src/main/java/com/chint/interfaces/rest/ly/dto/trainorderdatapushback/Result.java b/src/main/java/com/chint/interfaces/rest/ly/dto/trainorderdatapushback/Result.java deleted file mode 100644 index 406fddf8..00000000 --- a/src/main/java/com/chint/interfaces/rest/ly/dto/trainorderdatapushback/Result.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.chint.interfaces.rest.ly.dto.trainorderdatapushback; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@NoArgsConstructor -@Data -@AllArgsConstructor -public class Result { - private String success; - private String errorCode; - private String errorMessage; - private T data; - - public Result(String success, T data) { - this.success = success; - this.data = data; - } - - public Result(String errorCode, String errorMessage) { - this.errorCode = errorCode; - this.errorMessage = errorMessage; - } - - public static Result Success(String success, T data) { - return new Result(success,data); - } - - public static Result error(String errorCode,String errorMessage) { - return new Result(errorCode,errorMessage); - } -}