dfy api

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/DfyBaseData.java

@@ -0,0 +1,9 @@
+package com.zswl.cloud.springBatch.client.model.dfy;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class DfyBaseData {
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/DfyRequestBase.java

@@ -1,22 +1,23 @@
 package com.zswl.cloud.springBatch.client.model.dfy;
 
 import cn.hutool.core.date.DateUtil;
-import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
-@AllArgsConstructor
 public class DfyRequestBase {
 
     private String apiKey;
     private String sign;
     private final String timestamp;
 
-    public DfyRequestBase() {
+    private DfyBaseData data;
+
+    public DfyRequestBase(DfyBaseData data) {
 
         this.timestamp = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
+        this.data = data;
 
     }
 

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/DomesticHotel/request/AddOrderRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,41 +10,33 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class AddOrderRequest extends DfyRequestBase {
+public class AddOrderRequest extends DfyBaseData {
 
-    private Datas data;
+    private String sourceOrderId; // 分销商订单号
+    private Integer acctId; // 账号Id
+    private Long hotelId; // 酒店ID
+    private String ratePlanId; // 价格计划Id
 
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Datas {
-        private String sourceOrderId; // 分销商订单号
-        private Integer acctId; // 账号Id
-        private Long hotelId; // 酒店ID
-        private String ratePlanId; // 价格计划Id
-
-        // 0	无要求
-        //2	尽量安排无烟房
-        //8	尽量安排大床	仅当床型为“X张大床或X张双床”时，此选项才有效
-        //10	尽量安排双床房	仅当床型为“X张大床或X张双床”时，此选项才有效
-        //11	尽量安排吸烟房
-        //12	尽量高楼层
-        //15	尽量安排有窗房
-        //16	尽量安排安静房间
-        //18	尽量安排相近房间
-        private String specialRemarks;
-        private Integer numberofRooms; // 预定的房间数
-        private Integer manNum; // 成人数
-        private Integer childNum; // 儿童数
-        private List<Integer> childAges; // 儿童年龄
-        private String checkin; // 入住日期
-        private String checkout; // 离店日期
-        private Integer totalPrice; // 下单总价
-        private String contactName; // 分销商业务联系人姓名
-        private String contactPhone; // 分销商业务联系人手机号码
-        private String contactEmail; // 分销商业务联系人邮箱
-        private String customerArriveTime; // 客人到店时间
-        private List<String> customerInfo; // 入住人信息
-    }
+    // 0	无要求
+    //2	尽量安排无烟房
+    //8	尽量安排大床	仅当床型为“X张大床或X张双床”时，此选项才有效
+    //10	尽量安排双床房	仅当床型为“X张大床或X张双床”时，此选项才有效
+    //11	尽量安排吸烟房
+    //12	尽量高楼层
+    //15	尽量安排有窗房
+    //16	尽量安排安静房间
+    //18	尽量安排相近房间
+    private String specialRemarks;
+    private Integer numberofRooms; // 预定的房间数
+    private Integer manNum; // 成人数
+    private Integer childNum; // 儿童数
+    private List<Integer> childAges; // 儿童年龄
+    private String checkin; // 入住日期
+    private String checkout; // 离店日期
+    private Integer totalPrice; // 下单总价
+    private String contactName; // 分销商业务联系人姓名
+    private String contactPhone; // 分销商业务联系人手机号码
+    private String contactEmail; // 分销商业务联系人邮箱
+    private String customerArriveTime; // 客人到店时间
+    private List<String> customerInfo; // 入住人信息
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/DomesticHotel/request/HotelDetailRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,15 +8,9 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class HotelDetailRequest extends DfyRequestBase {
+public class HotelDetailRequest extends DfyBaseData {
 
-    private Datas data;
 
 
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Datas {
         private Long hotelId;
-    }
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/DomesticHotel/request/HotelListRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,47 +8,39 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class HotelListRequest extends DfyRequestBase {
+public class HotelListRequest extends DfyBaseData {
 
-    private Datas data;
 
+    // 起始位置，配合limit可以实现分页，如0代表第一页，i*limit代表第（i+1）页 i=1,2....n 正整数
+    private Integer start;
 
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public class Datas {
+    // 一页露出多少条(最多30)
+    private Integer limit;
 
-        // 起始位置，配合limit可以实现分页，如0代表第一页，i*limit代表第（i+1）页 i=1,2....n 正整数
-        private Integer start;
+    // 关键词
+    private String keyword;
 
-        // 一页露出多少条(最多30)
-        private Integer limit;
-
-        // 关键词
-        private String keyword;
-
-        // 城市code
-        private Integer cityCode;
+    // 城市code
+    private Integer cityCode;
 
-        // 城市名称
-        private String cityName;
+    // 城市名称
+    private String cityName;
 
-        // 入住日期，格式为：YYYY-MM-DD
-        private String checkInDate;
+    // 入住日期，格式为：YYYY-MM-DD
+    private String checkInDate;
 
-        // 离店日期，格式为：YYYY-MM-DD
-        private String checkOutDate;
+    // 离店日期，格式为：YYYY-MM-DD
+    private String checkOutDate;
 
-        // 排序规则(默认recommend.推荐值排序) recommend:推荐值降序 satisfaction :口碑 price-asc:起价升序 price-desc:起价降序
-        private String sortKey;
+    // 排序规则(默认recommend.推荐值排序) recommend:推荐值降序 satisfaction :口碑 price-asc:起价升序 price-desc:起价降序
+    private String sortKey;
 
-        // 是否返回聚合筛选条件,0:否,1:是。注意：returnFilter=1时搜索性能较差，尽量设置returnFilter=0
-        private Integer returnFilter;
+    // 是否返回聚合筛选条件,0:否,1:是。注意：returnFilter=1时搜索性能较差，尽量设置returnFilter=0
+    private Integer returnFilter;
 
-        // 聚合筛选条件
-        private FilterInfo filter;
+    // 聚合筛选条件
+    private FilterInfo filter;
 
-    }
 
     @Data
     @NoArgsConstructor

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/DomesticHotel/request/QueryNewRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,15 +8,6 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class QueryNewRequest extends DfyRequestBase {
-
-    private Datas data;
-
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Datas {
-        private String keywords;
-    }
+public class QueryNewRequest extends DfyBaseData {
+    private String keywords;
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/DomesticHotel/request/RatePlanInfoRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,15 +10,8 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class RatePlanInfoRequest extends DfyRequestBase {
+public class RatePlanInfoRequest extends DfyBaseData {
 
-    private Datas data;
-
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Datas {
         // 酒店ID
         private Long hotelId;
 
@@ -42,5 +35,4 @@ public class RatePlanInfoRequest extends DfyRequestBase {
 
         // 排除禁止OTA裸售的数据，默认false
         private Boolean excludeOta;
-    }
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/DomesticHotel/request/RatePlanRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,22 +10,14 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class RatePlanRequest extends DfyRequestBase {
+public class RatePlanRequest extends DfyBaseData {
 
-    private Datas data;
-
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Datas {
-        private String roomId; // 价格计划id
-        private Long hotelId; // 酒店ID
-        private String checkin; // 入店时间
-        private Integer roomNum; // 预订房间数，默认是1
-        private Integer manNum; // 成人数，不填时默认是1
-        private Integer childNum; // 儿童数，不填时默认是0
-        private List<Integer> childAges; // 儿童年龄，与儿童数匹配
-        private String checkout; // 离店时间
-    }
+    private String roomId; // 价格计划id
+    private Long hotelId; // 酒店ID
+    private String checkin; // 入店时间
+    private Integer roomNum; // 预订房间数，默认是1
+    private Integer manNum; // 成人数，不填时默认是1
+    private Integer childNum; // 儿童数，不填时默认是0
+    private List<Integer> childAges; // 儿童年龄，与儿童数匹配
+    private String checkout; // 离店时间
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/request/CancelOrderRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,18 +8,10 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class CancelOrderRequest extends DfyRequestBase {
+public class CancelOrderRequest extends DfyBaseData {
 
-    private Datas data;
-
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Datas {
 
         private Integer orderId;
 
         private String remark;
-    }
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/request/CreateOrderNewRequest.java

@@ -1,7 +1,7 @@
 package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -11,47 +11,40 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class CreateOrderNewRequest extends DfyRequestBase {
+public class CreateOrderNewRequest extends DfyBaseData {
 
 
-    private Datas data;
+    // 分销商订单号，非空时，可防止重复下单。若重复下单，则返回之前已生成的orderId，且isNewFlag=0。
+    private String sourceOrderId;
 
-    @Data
-    @AllArgsConstructor
-    @NoArgsConstructor
-    public class Datas {
-        // 分销商订单号，非空时，可防止重复下单。若重复下单，则返回之前已生成的orderId，且isNewFlag=0。
-        private String sourceOrderId;
+    // 笛风账号
+    private String acctId;
 
-        // 笛风账号
-        private String acctId;
+    // 门票产品ID
+    private int productId;
 
-        // 门票产品ID
-        private int productId;
+    // 出游日期. “YYYY-MM-DD”。请在前台限制，只有价格日历中存在的团期，才能作为出游日期。
+    private String startTime;
 
-        // 出游日期. “YYYY-MM-DD”。请在前台限制，只有价格日历中存在的团期，才能作为出游日期。
-        private String startTime;
+    // 预订数量
+    private Integer bookNumber;
 
-        // 预订数量
-        private Integer bookNumber;
+    // 取票人信息
+    private ContactInfo contact;
 
-        // 取票人信息
-        private ContactInfo contact;
+    // 游客资料列表。“门票详情接口->custInfoLimit“=2、3、6、7时，此字段必填。
+    private List<VisitorInfo> touristList;
 
-        // 游客资料列表。“门票详情接口->custInfoLimit“=2、3、6、7时，此字段必填。
-        private List<VisitorInfo> touristList;
+    private DeliveryInfo delivery;
 
-        private DeliveryInfo delivery;
-
-        //使用笛风券金额
-        //
-        //使用笛风券会自动扣减订单金额，比如预订产品总额100元，使用旅游券10元，则下单后订单金额为90元；
-        //
-        //假如使用笛风券金额=预订产品总额，则订单金额为0元，并且下单后不需要调用【出票（代扣）接口】，会自动出票，因为这种情况系统认为钱已经付清了；
-        //
-        //如遇退票、预订失败等情况，已使用的笛风券会自动退回；
-        private Integer couponValue;
-    }
+    //使用笛风券金额
+    //
+    //使用笛风券会自动扣减订单金额，比如预订产品总额100元，使用旅游券10元，则下单后订单金额为90元；
+    //
+    //假如使用笛风券金额=预订产品总额，则订单金额为0元，并且下单后不需要调用【出票（代扣）接口】，会自动出票，因为这种情况系统认为钱已经付清了；
+    //
+    //如遇退票、预订失败等情况，已使用的笛风券会自动退回；
+    private Integer couponValue;
 
 
     @Data

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/request/DetailRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,16 +8,8 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class DetailRequest extends DfyRequestBase {
+public class DetailRequest extends DfyBaseData {
 
-    private Datas data;
-
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Datas {
-        private Integer page;
-        private Integer pageSize;
-    }
+    private Integer page;
+    private Integer pageSize;
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/request/OrderDetailRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,21 +8,13 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class OrderDetailRequest extends DfyRequestBase {
+public class OrderDetailRequest extends DfyBaseData {
 
-    private Datas data;
+    // 笛风系统管理员账号
+    private String acctId;
 
+    // 订单ID
+    private int orderId;
 
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Datas {
-        // 笛风系统管理员账号
-        private String acctId;
 
-        // 订单ID
-        private int orderId;
-
-
-    }
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/request/OrderStatusRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,16 +8,8 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class OrderStatusRequest extends DfyRequestBase {
+public class OrderStatusRequest extends DfyBaseData {
 
-    private Datas data;
-
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Datas {
-        private Integer orderId;
-        private String acctId;
-    }
+    private Integer orderId;
+    private String acctId;
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/request/PrivilegeTicketListRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,16 +8,8 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class PrivilegeTicketListRequest extends DfyRequestBase {
+public class PrivilegeTicketListRequest extends DfyBaseData {
 
-    private Datas data;
-
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Datas {
         private Integer page;
         private Integer pageSize;
-    }
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/request/ScenicDetailRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,17 +8,8 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class ScenicDetailRequest extends DfyRequestBase {
+public class ScenicDetailRequest extends DfyBaseData {
 
-    private scenicId data;
+    private String scenicId;
 
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class scenicId {
-        private String scenicId;
-
-
-    }
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/request/ScenicListRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,19 +8,12 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class ScenicListRequest extends DfyRequestBase {
+public class ScenicListRequest extends DfyBaseData {
 
-    private Scenic data;
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Scenic {
 
         private String key;
         private String page;
         private String pageSize;
 
 
-    }
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/request/SubmitOrderRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,15 +8,8 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class SubmitOrderRequest extends DfyRequestBase {
+public class SubmitOrderRequest extends DfyBaseData {
 
-    private Datas data;
-
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Datas {
         // 笛风系统管理员账号
         private String acctId;
 
@@ -31,5 +24,4 @@ public class SubmitOrderRequest extends DfyRequestBase {
 
         // 平台标识（10001:PC,20000:m站，30001:app安卓，30002:appIOS，30003:appWindows）（默认是pc）
         private String platform;
-    }
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/request/TuiPiaoRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,22 +8,14 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class TuiPiaoRequest extends DfyRequestBase {
+public class TuiPiaoRequest extends DfyBaseData {
 
-    private Datas data;
+    // 订单ID
+    private Integer orderId;
 
+    // 退订类型
+    private Integer causeType;
 
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Datas {
-        // 订单ID
-        private Integer orderId;
-
-        // 退订类型
-        private Integer causeType;
-
-        // 退订原因
-        private String causeContent;
-    }
+    // 退订原因
+    private String causeContent;
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/request/VerifyOrderRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,16 +8,8 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class VerifyOrderRequest extends DfyRequestBase {
+public class VerifyOrderRequest extends DfyBaseData {
 
-    private Datas data;
-
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Datas {
-        // 订单ID
-        private Integer orderId;
-    }
+    // 订单ID
+    private Integer orderId;
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/pub/request/QueryRequest.java

@@ -1,6 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.pub.request;
 
-import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,15 +8,8 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class QueryRequest extends DfyRequestBase {
+public class QueryRequest extends DfyBaseData {
 
-    private Datas data;
-
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Datas {
         // 笛风账号
         private String acctId;
 
@@ -40,5 +33,4 @@ public class QueryRequest extends DfyRequestBase {
 
         // 分页查询一页显示条目，最大100
         private Integer limit;
-    }
 }

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/api/dfy/DomesticHotelApi.java

@@ -2,11 +2,10 @@ package com.zswl.cloud.springBtach.server.core.api.dfy;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
 import com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request.QueryNewRequest;
 import com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.response.QueryNewResponse;
-import com.zswl.cloud.springBatch.client.model.dfy.Ticket.request.ScenicListRequest;
-import com.zswl.cloud.springBatch.client.model.dfy.Ticket.response.ScenicListResponse;
 import com.zswl.cloud.springBtach.server.core.dao.ApiLogDao;
 import com.zswl.cloud.springBtach.server.core.domain.ApiLog;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,9 +41,9 @@ public class DomesticHotelApi {
 
     }
 
-    private String post(DfyRequestBase dfyRequestBase, String url) {
-
+    private String post(DfyBaseData dfyBaseData, String url) {
 
+        DfyRequestBase dfyRequestBase= new DfyRequestBase(dfyBaseData);
         dfyRequestBase.setApiKey(apiKey);
         String signature = Signature.getSignature(JSONUtil.parseObj(dfyRequestBase), secretKey);
         dfyRequestBase.setSign(signature);

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/api/dfy/TicketApi.java

@@ -2,6 +2,7 @@ package com.zswl.cloud.springBtach.server.core.api.dfy;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
 import com.zswl.cloud.springBatch.client.model.dfy.Ticket.request.*;
 import com.zswl.cloud.springBatch.client.model.dfy.Ticket.response.*;
@@ -113,8 +114,9 @@ public class TicketApi {
         return JSONUtil.toBean(post, TuiPiaoResponse.class);
     }
 
-    private String post(DfyRequestBase dfyRequestBase, String url) {
+    private String post(DfyBaseData dfyBaseData, String url) {
 
+        DfyRequestBase dfyRequestBase = new DfyRequestBase(dfyBaseData);
 
         dfyRequestBase.setApiKey(apiKey);
         String signature = Signature.getSignature(JSONUtil.parseObj(dfyRequestBase), secretKey);