dfy api

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

@@ -1,4 +1,4 @@
-package com.zswl.cloud.springBatch.client.model.dfy.request;
+package com.zswl.cloud.springBatch.client.model.dfy;
 
 import cn.hutool.core.date.DateUtil;
 import lombok.AllArgsConstructor;

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/response/DfyResponseBase.java → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/DfyResponseBase.java

@@ -1,4 +1,4 @@
-package com.zswl.cloud.springBatch.client.model.dfy.response;
+package com.zswl.cloud.springBatch.client.model.dfy;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -0,0 +1,50 @@
+package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AddOrderRequest extends DfyRequestBase {
+
+    private Datas data;
+
+
+    @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; // 入住人信息
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class HotelDetailRequest extends DfyRequestBase {
+
+    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

@@ -0,0 +1,116 @@
+package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class HotelListRequest extends DfyRequestBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Datas {
+
+        // 起始位置，配合limit可以实现分页，如0代表第一页，i*limit代表第（i+1）页 i=1,2....n 正整数
+        private Integer start;
+
+        // 一页露出多少条(最多30)
+        private Integer limit;
+
+        // 关键词
+        private String keyword;
+
+        // 城市code
+        private Integer cityCode;
+
+        // 城市名称
+        private String cityName;
+
+        // 入住日期，格式为：YYYY-MM-DD
+        private String checkInDate;
+
+        // 离店日期，格式为：YYYY-MM-DD
+        private String checkOutDate;
+
+        // 排序规则(默认recommend.推荐值排序) recommend:推荐值降序 satisfaction :口碑 price-asc:起价升序 price-desc:起价降序
+        private String sortKey;
+
+        // 是否返回聚合筛选条件,0:否,1:是。注意：returnFilter=1时搜索性能较差，尽量设置returnFilter=0
+        private Integer returnFilter;
+
+        // 聚合筛选条件
+        private FilterInfo filter;
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class FilterInfo {
+        // 起始位置，配合limit可以实现分页，如0代表第一页，i*limit代表第（i+1）页 i=1,2....n 正整数
+        private Integer start;
+
+        // 一页露出多少条(最多30)
+        private Integer limit;
+
+        // 关键词
+        private String keyword;
+
+        // 城市code
+        private Integer cityCode;
+
+        // 城市名称
+        private String cityName;
+
+        // 入住日期，格式为：YYYY-MM-DD
+        private String checkInDate;
+
+        // 离店日期，格式为：YYYY-MM-DD
+        private String checkOutDate;
+
+        // 排序规则(默认recommend.推荐值排序) recommend:推荐值降序 satisfaction :口碑 price-asc:起价升序 price-desc:起价降序
+        private String sortKey;
+
+        // 是否返回聚合筛选条件,0:否,1:是。注意：returnFilter=1时搜索性能较差，尽量设置returnFilter=0
+        private Integer returnFilter;
+
+        // 聚合筛选条件
+        private FilterInfo filter;
+
+        // 星级
+        private Integer[] star;
+
+        // 区域关键字 通过搜索结果反向聚合
+        private String poiKey;
+
+        // 经纬度对应的编号 取经纬度同层参数code
+        private Integer poiCode;
+
+        // 品牌 通过搜索结果反向聚合
+        private Integer[] brand;
+
+        // 房价范围 自定义
+        private String[] price;
+
+        // 设施 通过搜索结果反向聚合
+        private Integer[] facility;
+
+        // 经度
+        private Double longitude;
+
+        // 纬度
+        private Double latitude;
+
+        // 特色 通过搜索结果反向聚合
+        private Integer[] feature;
+
+
+    }
+}

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

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

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

@@ -0,0 +1,46 @@
+package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RatePlanInfoRequest extends DfyRequestBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Datas {
+        // 酒店ID
+        private Long hotelId;
+
+        // 入店时间
+        private String checkIn;
+
+        // 离店时间
+        private String checkOut;
+
+        // 房间数，默认是1
+        private Integer roomNum;
+
+        // 成人数，默认是1；注意，每间房至少一个成人
+        private Integer manNum;
+
+        // 儿童数，默认是0
+        private Integer childNum;
+
+        // 儿童年龄，与儿童数匹配
+        private List<Integer> childAges;
+
+        // 排除禁止OTA裸售的数据，默认false
+        private Boolean excludeOta;
+    }
+}

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

@@ -0,0 +1,31 @@
+package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RatePlanRequest extends DfyRequestBase {
+
+    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; // 离店时间
+    }
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/DomesticHotel/response/AddOrderResponse.java

@@ -0,0 +1,33 @@
+package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.response;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AddOrderResponse extends DfyResponseBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Datas {
+
+        private Boolean success; // 是否下单成功
+        private Integer orderId; // 订单Id
+        private Integer isNewFlag; // 笛风订单号是否新生成，1：是，0：否
+        private String errorCode; // 错误码
+        private String msg; // 错误信息
+
+    }
+
+
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/DomesticHotel/response/HotelDetailResponse.java

@@ -0,0 +1,199 @@
+package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.response;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class HotelDetailResponse extends DfyResponseBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Datas {
+
+        // 酒店ID
+        private Long hotelId;
+
+        // 酒店地址
+        private String address;
+
+        // 酒店中文名
+        private String chineseName;
+
+        // 酒店英文名
+        private String englishName;
+
+        // 装修时间
+        private String decorateDate;
+
+        // 星级
+        private Integer star;
+
+        // 星级名
+        private String starName;
+
+        // 酒店房间数
+        private Integer roomCount;
+
+        // 开业年份
+        private String debutYear;
+
+        // 酒店联系电话
+        private String tel;
+
+        // 纬度
+        private Double latitude;
+
+        // 经度
+        private Double longitude;
+
+        // 酒店介绍
+        private String instruction;
+
+        // 图片列表
+        private List<Picture> pictures;
+
+        // 服务
+        private List<Service> services;
+
+        // 设施项目
+        private List<Facility> facilities;
+
+        // 周边交通和位置
+        private List<PoiInfo> poiInfos;
+
+        // 政策
+        private PolicyInfo policy;
+
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Picture {
+
+        // 图片存储路径。详见《图片尺寸说明》
+        private String path;
+
+        // 图片代表位置的描述（如头图，外观，大堂）
+        private String name;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Service {
+        // 服务code
+        private String code;
+
+        // 服务名
+        private String name;
+
+        // 服务类型名
+        private String typeName;
+
+        // 服务状态
+        private String status; // 0=无, 1=有, 2=不确定, 3=部分有
+
+        // 服务类型code
+        private String typeCode;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Facility {
+
+        // 设施code
+        private String code;
+
+        // 设施名
+        private String name;
+
+        // 设施类型名
+        private String typeName;
+
+        // 设施状态
+        private String status; // 0=无, 1=有, 2=不确定, 3=部分有
+
+        // 设施类型code
+        private String typeCode;
+
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class PoiInfo {
+
+        // POI类型code
+        private Integer type;
+
+        // POI类型名称
+        private String name;
+
+        // POI信息列表
+        private List<SubPoiInfo> subPoiInfos;
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class PolicyInfo {
+
+        // 退订规则
+        private String cancel;
+
+        // 特殊要求
+        private String requirements;
+
+        // 离店时间
+        private String checkOutTime;
+
+        // 儿童
+        private String children;
+
+        // 入住时间
+        private String checkInTime;
+
+        // 接受证件
+        private String acceptCreditCards;
+
+        // 入住离店时间
+        private String arrivalDeparture;
+
+        // 入住需要
+        private String depositPrepaid;
+
+        // 是否可携带宠物
+        private String pet;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class SubPoiInfo {
+
+        // 距离酒店多少公里
+        private String distance;
+
+        // POI名称
+        private String name;
+
+        // POI描述
+        private String trafficDesc;
+    }
+
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/DomesticHotel/response/HotelListResponse.java

@@ -0,0 +1,131 @@
+package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.response;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class HotelListResponse extends DfyResponseBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Datas {
+
+        // 酒店数量
+        private Integer count;
+
+        // 酒店列表
+        private List<HotelInfo> hotelList;
+
+        // 过滤条件
+        private List<Filter> filter;
+
+
+    }
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class HotelInfo {
+        // 酒店ID
+        private String hotelId;
+
+        // 酒店中文名
+        private String chineseName;
+
+        // 酒店英文名
+        private String englishName;
+
+        // 星级
+        private Integer star;
+
+        // 星级名称
+        private String starName;
+
+        // 酒店地址
+        private String address;
+
+        // 经度
+        private Double longitude;
+
+        // 纬度
+        private Double latitude;
+
+        // 设施 枚举如下：1.免费wifi 2.餐厅 3.停车场 4.接机服务 5.免费洗漱用品 7.游泳池 8.健身房 9.会议室 10.SPA 12.24小时热水
+        private Integer[] facilities;
+
+        // 起价
+        private BigDecimal price;
+
+        // 图片
+        private String picture;
+
+
+    }
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Filter {
+        // 过滤条件id
+        private String filterId;
+
+        // 过滤条件名称
+        private String filterName;
+
+        // 过滤条件的子信息
+        private List<Pros> pros;
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Pros {
+
+        // ID
+        private Integer id;
+
+        // 名称
+        private String name;
+
+        // 子信息。仅当filterId=area时有数据
+        private List<ProsOne> pros;
+
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class ProsOne {
+
+        // ID
+        private Integer id;
+
+        // 地图经度-（百度）
+        private String lng;
+
+        // 地图纬度-（百度）
+        private String lat;
+
+        // 名称
+        private String name;
+
+
+    }
+
+
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/DomesticHotel/response/QueryNewResponse.java

@@ -0,0 +1,65 @@
+package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.response;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class QueryNewResponse extends DfyResponseBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Datas {
+
+        // 目的地列表
+        private List<Dest> destinationSuggests;
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Dest {
+        // 编号，如果poiType是7，该编号就是酒店ID（hotelId）
+        private Integer code;
+
+        // poi类型值：1-城市，2-行政区，3-商圈，4-景点，7-酒店，12-机场，13-地铁，14-火车站
+        private Integer poiType;
+
+        // 显示名称
+        private String displayName;
+
+        // 纬度坐标值
+        private String latitude;
+
+        // 经度坐标值
+        private String longitude;
+
+        // 城市code
+        private Integer cityCode;
+
+        // 城市名
+        private String cityName;
+
+        // 酒店英文名
+        private String englishName;
+
+        // 酒店中文名
+        private String chineseName;
+
+        // 酒店数量
+        private Integer hotelCount;
+
+    }
+
+
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/DomesticHotel/response/RatePlanInfoResponse.java

@@ -0,0 +1,271 @@
+package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.response;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RatePlanInfoResponse extends DfyResponseBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    class Datas {
+
+        private String roomInfo;
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    class RoomInfo {
+        // 物理房型ID
+        private Long roomId;
+
+        // 房型中文名
+        private String roomNameCn;
+
+        // 房型面积大小
+        private String area;
+
+        // 是否可加床
+        private String isExtraBed;
+
+        // 床型描述
+        private String bedDescription;
+
+        // 图片列表
+        private List<Pic> pictures;
+
+        // 无烟房
+        private String noSmoking;
+
+        // 房型所在楼层数
+        private String floor;
+
+        // 价格计划列表信息
+        private List<RatePlanInfo> ratePlanInfo;
+
+        // 设施数组
+        private List<Facility> facilities;
+
+        // 窗型
+        private Integer window; // 0=无窗, 1=部分有窗, 2=有窗, 3=不确定, 4=内窗, 5=天窗, 6=封闭窗, 7=飘窗
+
+        // 宽带
+        private Integer broadband; // 1=免费提供, 2=不提供此服务, 3=收费提供, 4=部分收费, 5=部分提供并收费, 6=部分能提供并免费, 7=部分提供并只有部分和收费, 8=有, 9=不确定
+
+        // WiFi
+        private Integer wifi; // 1=免费提供, 2=不提供此服务, 3=收费提供, 4=部分收费, 5=部分提供并收费, 6=部分能提供并免费, 7=部分提供并只有部分和收费, 8=有, 9=不确定
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    class Pic {
+        private String picName;
+
+        private String path;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    class RatePlanInfo {
+
+        // 价格计划ID
+        private String id;
+
+        // 价格计划名称
+        private String name;
+
+        // 床型简称
+        private String bedType;
+
+        // 床型描述
+        private String bedInfo;
+
+        // 早餐（文本描述）
+        private String mealInfo;
+
+        // 早餐（结构化）
+        private Meal meal;
+
+        // 网络描述
+        private String networkInfo;
+
+        // wifi服务
+        private String wifi;
+
+        // 宾客类型：0或1 (所有宾客)、2 (内宾)、3 (中宾)、4 (外宾)
+        private Integer guestType;
+
+        // 发票开具方式
+        private Integer invoiceType;
+
+        // 每间房最多可住人数
+        private Integer maxOccupancy;
+
+        // 是否立即确认
+        private Boolean instantConfirm;
+
+        // 取消政策（文本描述）
+        private CancelInfo cancel;
+
+        // 取消政策（结构化）
+        private Refund refund;
+
+        // 促销信息
+        private List<PromotionRule> promotionRules;
+
+        // 每日价格，以“|”分隔，数量需与入住/离店时间对应
+        private String guidedPrice;
+
+        // 库存量（提供参考），房间每天的库存量，与销售指导价对应；以“|”分隔
+        private String counts;
+
+        // 平均结算价 averagePrice=ratePrice+taxAndFeePrice(（选中天数+间数的总结算价）/天数/间数)
+        private Integer averagePrice;
+
+        // 平均房费价(（选中天数+间数的总房费）/天数/间数)
+        private Integer ratePrice;
+
+        // 平均税费价，国内酒店通常为0(（选中天数+间数的总税费）/天数/间数)
+        private Integer taxAndFeePrice;
+
+        // 默认值为0; 为1时...
+        private Integer otaForbid;
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    class Facility {
+
+        private String code;
+        private String name;
+        private List<SubFacilities> tmpSubFacilities;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    class SubFacilities {
+
+        private String subCode;
+        private String subName;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    class CancelInfo {
+
+        // 取消描述
+        private String name;
+
+        // 取消政策类型(1不可取销,2限时取消,3收费取消)
+        private Integer type;
+
+        // 取消政策描述
+        private String desc;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    class Meal {
+        // 早餐
+        private MealDetail breakfast;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    class MealDetail {
+
+        // 早餐情况，>=0，以“|”分隔，2|1表示第一天2人早餐，第二天1人早餐
+        private String count;
+
+        // 餐食的详细描述，可为空。且当count="99"时，以desc描述为准
+        private String desc;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    class Refund {
+
+        // Other fields...
+
+        // true代表预订的房间可按如下规则取消
+        private Boolean returnable;
+
+        // 详情的取消规则，包含多个refundRule次级子节点
+        private List<RefundRule> refundRules;
+
+        // 不可取消周期通常用于节日或旺季，此规则优先级较普通取消规则高，在这个日期范围内不能取消。
+        private NonRefundableRange nonRefundableRange;
+
+        // 取消规则中时间点的时区信息，不填写则默认为北京时间。
+        private String timeZone;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    class RefundRule {
+
+        // 离入住当天24:00之前的小时数，如：checkin=2015-01-23, before = 6 代表 2015-01-23 18:00:00
+        private String before;
+
+        // 规则类型，NO_DEDUCTION（不扣减）、DEDUCT_BY_AMOUNT（扣减金额）、DEDUCT_BY_PERCENT（百分比扣减）、
+        //DEDUCT_FIRST_NIGHT（扣除首晚）
+        private String type;
+
+        // 取消所需要扣减的数值
+        private String value;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    class NonRefundableRange {
+
+        // 不可取消周期起始日期
+        private Date fromDate;
+
+        // 不可取消周期结束日期
+        private Date toDate;
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    class PromotionRule {
+
+        // 销类型
+        //FREE_GIFT.礼包
+        //仅当code=FREE_GIFT时需要关注，其他类型不需要处理
+        private String code;
+
+        // 促销描述
+        private String desc;
+
+    }
+
+
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/DomesticHotel/response/RatePlanResponse.java

@@ -0,0 +1,59 @@
+package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.response;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RatePlanResponse extends DfyResponseBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Datas {
+
+        private String id; // 价格计划ID
+        private String name; // 价格计划名称
+        private String bedType; // 床型简称
+        private String bedInfo; // 床型描述
+        private String mealInfo; // 早餐（文本描述）
+        private RatePlanInfoResponse.Meal meal; // 早餐（结构化）
+        private String networkInfo; // 网络描述
+        private String wifi; // wifi服务
+        private Integer guestType; // 宾客类型：1 (所有宾客)、2 (内宾)、3 (中宾)、4 (外宾)
+        private Integer invoiceType; // 发票开具方式
+        private Integer maxOccupancy; // 每间房最多可住人数
+        private RatePlanInfoResponse.CancelInfo cancel; // 取消政策（文本描述）
+        private RatePlanInfoResponse.Refund refund; // 取消政策（结构化）
+        private List<RatePlanInfoResponse.PromotionRule> promotionRules; // 促销信息
+        private String guidedPrice; // 每日价格
+        private BigDecimal averagePrice; // 平均结算价
+        private BigDecimal totalPrice; // 下单总价
+        private BigDecimal ratePrice; // 平均房费价
+        private BigDecimal taxAndFeePrice; // 平均税费价
+        private List<Remark> remarks; // 预定页温馨提示
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Remark {
+
+        private String value;
+
+        private Integer seq;
+
+    }
+
+
+}

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

@@ -1,5 +1,6 @@
-package com.zswl.cloud.springBatch.client.model.dfy.request;
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
+import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -7,7 +8,7 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class CancelOrderRequest extends DfyRequestBase{
+public class CancelOrderRequest extends DfyRequestBase {
 
     private Datas data;
 

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

@@ -1,6 +1,7 @@
-package com.zswl.cloud.springBatch.client.model.dfy.request;
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
 
+import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -1,5 +1,6 @@
-package com.zswl.cloud.springBatch.client.model.dfy.request;
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
+import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -7,7 +8,7 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class DetailRequest extends DfyRequestBase{
+public class DetailRequest extends DfyRequestBase {
 
     private Datas data;
 

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

@@ -1,5 +1,6 @@
-package com.zswl.cloud.springBatch.client.model.dfy.request;
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
+import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -7,7 +8,7 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class OrderDetailRequest extends DfyRequestBase{
+public class OrderDetailRequest extends DfyRequestBase {
 
     private Datas data;
 

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

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

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

@@ -1,5 +1,6 @@
-package com.zswl.cloud.springBatch.client.model.dfy.request;
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
+import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -1,5 +1,6 @@
-package com.zswl.cloud.springBatch.client.model.dfy.request;
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
+import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -1,5 +1,6 @@
-package com.zswl.cloud.springBatch.client.model.dfy.request;
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
+import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -1,5 +1,6 @@
-package com.zswl.cloud.springBatch.client.model.dfy.request;
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
+import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -7,7 +8,7 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class SubmitOrderRequest extends DfyRequestBase{
+public class SubmitOrderRequest extends DfyRequestBase {
 
     private Datas data;
 

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

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

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

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

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/response/CreateOrderNewResponse.java → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/response/CreateOrderNewResponse.java

@@ -1,11 +1,10 @@
-package com.zswl.cloud.springBatch.client.model.dfy.response;
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.response;
 
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/response/DetailResponse.java → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/response/DetailResponse.java

@@ -1,5 +1,6 @@
-package com.zswl.cloud.springBatch.client.model.dfy.response;
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.response;
 
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/response/OrderDetailResponse.java → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/response/OrderDetailResponse.java

@@ -1,5 +1,6 @@
-package com.zswl.cloud.springBatch.client.model.dfy.response;
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.response;
 
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/response/OrderStatusResponse.java

@@ -0,0 +1,34 @@
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.response;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderStatusResponse extends DfyResponseBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Datas {
+
+        // 订单状态:
+        //
+        //待确认：订单正在校验/占位；
+        //待付款：订单在此状态下，同时满足“支付开关canPay=1.可支付”，则可以调用出票代扣接口进行付款；
+        //
+        //出票中（已确认）：付款后出票中到此状态；
+        //已完成：表示出票成功；
+        //已取消：订单取消成功，或者退票成功，到此状态；
+        private String orderStatus;
+
+
+    }
+
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/response/PrivilegeTicketListResponse.java → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/response/PrivilegeTicketListResponse.java

@@ -1,5 +1,6 @@
-package com.zswl.cloud.springBatch.client.model.dfy.response;
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.response;
 
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/response/ScenicDetailResponse.java → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/response/ScenicDetailResponse.java

@@ -1,5 +1,6 @@
-package com.zswl.cloud.springBatch.client.model.dfy.response;
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.response;
 
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/response/ScenicListResponse.java → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/response/ScenicListResponse.java

@@ -1,5 +1,6 @@
-package com.zswl.cloud.springBatch.client.model.dfy.response;
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.response;
 
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/response/SubmitOrderResponse.java → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/response/SubmitOrderResponse.java

@@ -1,5 +1,6 @@
-package com.zswl.cloud.springBatch.client.model.dfy.response;
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.response;
 
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/response/TuiPiaoResponse.java

@@ -0,0 +1,29 @@
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.response;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class TuiPiaoResponse extends DfyResponseBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Datas {
+
+
+        // 1标识为警告，0无含义，默认为0
+        private Integer resultType;
+
+        private String msg;
+
+    }
+
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/response/VerifyOrderResponse.java

@@ -0,0 +1,39 @@
+package com.zswl.cloud.springBatch.client.model.dfy.Ticket.response;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class VerifyOrderResponse extends DfyResponseBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Datas {
+
+        // 是否支持核销信息查询。false表示不支持核销信息查询；true支持核销信息查询
+        private Boolean supportVerify;
+
+        // 核销信息。有4种格式，解析第1种格式可以获取核销数量。
+        // 1.“总数量2次，已使用2次”
+        // 2.“未找到订单记录！”
+        // 3.“未查询到核销信息”
+        // 4.“发生异常：XXX”
+        private String verifyMsg;
+
+        // 总数量。如果查询不到核销信息，值为-1。
+        private Integer totalCount;
+
+        // 核销数量。如果查询不到核销信息，值为-1。
+        private Integer usedCount;
+
+    }
+
+}

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

@@ -0,0 +1,44 @@
+package com.zswl.cloud.springBatch.client.model.dfy.pub.request;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyRequestBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class QueryRequest extends DfyRequestBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Datas {
+        // 笛风账号
+        private String acctId;
+
+        // 账号类型：1途牛钱包， 3：企业支付宝
+        private Integer accType;
+
+        // 账单类型：2代扣
+        private Integer billType;
+
+        // 状态：1：处理完成，-1：处理失败，3处理中
+        private Integer status;
+
+        // 查询起始时间，格式：yyyy-MM-dd HH:mm:ss
+        private String beginTime;
+
+        // 查询结束时间，格式：yyyy-MM-dd HH:mm:ss
+        private String endTime;
+
+        // 分页查询起始条目，从0开始
+        private Integer start;
+
+        // 分页查询一页显示条目，最大100
+        private Integer limit;
+    }
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/pub/response/QueryResponse.java

@@ -0,0 +1,69 @@
+package com.zswl.cloud.springBatch.client.model.dfy.pub.response;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class QueryResponse extends DfyResponseBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Datas {
+
+        private Integer count;
+
+        private Integer pages;
+
+        private List<QueryBillsDto> rows;
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class QueryBillsDto {
+
+        // 本次交易金额
+        private String amount;
+
+        // 订单号
+        private String bizOrderId;
+
+        // 账户流水号；与途牛钱包网站【交易管理】模块呈现的流水号一致。
+        private String merFlowNo;
+
+        // 代扣流水号；与【出票(代扣)接口】返回的outTradeNo 字段对应，可用于系统自动对账
+        private String outTradeNo;
+
+        // 账单处理结果，1处理完成-1处理失败3处理
+        private Integer status;
+
+        // 账单类型：1支付，2代扣，3代付，4退款，5提现
+        private Integer billType;
+
+        // 账单类型描述
+        private String billTypeDesc;
+
+        // 添加时间，格式如：2016-03-11 13:54:52
+        private String time;
+
+        // 产品品类
+        private String productType;
+
+        // 备注
+        private String remark;
+
+    }
+
+
+}

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

@@ -0,0 +1,64 @@
+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.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;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DomesticHotelApi {
+
+    @Autowired
+    ApiLogDao apiLogDao;
+
+    @Value("${dfy.host}")
+    private String host;
+
+    @Value("${dfy.jd.acctId}")
+    private String acctId;
+
+    @Value("${dfy.jd.secretkey}")
+    private String secretKey;
+
+
+    @Value("${dfy.jd.apikey}")
+    private String apiKey;
+
+    // 景点列表查询
+
+    public QueryNewResponse queryNew(QueryNewRequest queryNewRequest) {
+
+        String post = post(queryNewRequest, "/DomesticHotel/hotel/destination/queryNew");
+
+        return JSONUtil.toBean(post, QueryNewResponse.class);
+
+    }
+
+    private String post(DfyRequestBase dfyRequestBase, String url) {
+
+
+        dfyRequestBase.setApiKey(apiKey);
+        String signature = Signature.getSignature(JSONUtil.parseObj(dfyRequestBase), secretKey);
+        dfyRequestBase.setSign(signature);
+
+        String post = HttpUtil.post(host + url, JSONUtil.toJsonStr(dfyRequestBase));
+        ApiLog apiLog = new ApiLog();
+        apiLog.setSystem("difengyun");
+        apiLog.setService(url);
+        apiLog.setRequest(post);
+        apiLog.setResponse(JSONUtil.toJsonStr(post));
+        apiLogDao.save(apiLog);
+        return post;
+
+    }
+
+
+}

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

@@ -0,0 +1,7 @@
+package com.zswl.cloud.springBtach.server.core.api.dfy;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class PublicApi {
+}

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

@@ -2,8 +2,9 @@ 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.request.*;
-import com.zswl.cloud.springBatch.client.model.dfy.response.*;
+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.*;
 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;
@@ -11,7 +12,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 @Component
-public class DiFengYunApi {
+public class TicketApi {
 
     @Autowired
     ApiLogDao apiLogDao;
@@ -19,6 +20,9 @@ public class DiFengYunApi {
     @Value("${dfy.host}")
     private String host;
 
+    @Value("${dfy.mp.acctId}")
+    private String acctId;
+
     @Value("${dfy.mp.secretkey}")
     private String secretKey;
 
@@ -26,7 +30,7 @@ public class DiFengYunApi {
     @Value("${dfy.mp.apikey}")
     private String apiKey;
 
-    public DiFengYunApi(ApiLogDao apiLogDao) {
+    public TicketApi(ApiLogDao apiLogDao) {
         this.apiLogDao = apiLogDao;
     }
 
@@ -80,11 +84,34 @@ public class DiFengYunApi {
 
 
     // 出票(代扣)接口
-    public SubmitOrderResponse SubmitOrderResponse(SubmitOrderRequest submitOrderRequest) {
+    public SubmitOrderResponse submitOrderResponse(SubmitOrderRequest submitOrderRequest) {
         String post = post(submitOrderRequest, "/Ticket/submitOrder");
         return JSONUtil.toBean(post, SubmitOrderResponse.class);
     }
 
+    // 订单详情接口
+    public OrderDetailResponse orderDetail(OrderDetailRequest orderDetailRequest) {
+        String post = post(orderDetailRequest, "/Ticket/orderDetail");
+        return JSONUtil.toBean(post, OrderDetailResponse.class);
+    }
+
+    // 订单状态接口
+    public OrderStatusResponse orderStatus(OrderStatusRequest orderStatusRequest) {
+        String post = post(orderStatusRequest, "/Ticket/orderStatus");
+        return JSONUtil.toBean(post, OrderStatusResponse.class);
+    }
+
+    // 核销查询接口
+    public VerifyOrderResponse verifyOrder(VerifyOrderRequest verifyOrderRequest) {
+        String post = post(verifyOrderRequest, "/Ticket/verifyOrder");
+        return JSONUtil.toBean(post, VerifyOrderResponse.class);
+    }
+
+    // 退票申请接口
+    public TuiPiaoResponse tuiPiao(TuiPiaoRequest tuiPiaoRequest) {
+        String post = post(tuiPiaoRequest, "/Ticket/tuiPiao");
+        return JSONUtil.toBean(post, TuiPiaoResponse.class);
+    }
 
     private String post(DfyRequestBase dfyRequestBase, String url) {