dfy 酒店

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

@@ -1,38 +0,0 @@
-package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
-
-import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class RatePlanInfoRequest extends DfyBaseData {
-
-        // 酒店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/response/OrderDetailResponse.java

@@ -1,37 +0,0 @@
-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;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class OrderDetailResponse extends DfyResponseBase {
-
-    private Datas data;
-
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public class Datas {
-
-        private ContactInfo contactInfo; // 是否下单成功
-        private Integer hotelInfo; // 订单Id
-        private Integer orderInfo; // 笛风订单号是否新生成，1：是，0：否
-
-    }
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public class ContactInfo {
-
-        private String contactName;
-
-
-    }
-
-
-}

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

@@ -1,4 +1,4 @@
-package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
+package com.zswl.cloud.springBatch.client.model.dfy.Hotel.request;
 
 import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
@@ -13,7 +13,7 @@ import java.util.List;
 public class AddOrderRequest extends DfyBaseData {
 
     private String sourceOrderId; // 分销商订单号
-    private Integer acctId; // 账号Id
+    private String acctId; // 账号Id
     private Long hotelId; // 酒店ID
     private String ratePlanId; // 价格计划Id
 

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

@@ -0,0 +1,21 @@
+package com.zswl.cloud.springBatch.client.model.dfy.Hotel.request;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CancelOrderRequest extends DfyBaseData {
+
+    @ApiModelProperty(value = "分销商账户ID")
+    private String acctId;
+
+    @ApiModelProperty(value = "订单ID")
+    private int orderId;
+
+
+}

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

@@ -1,4 +1,4 @@
-package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
+package com.zswl.cloud.springBatch.client.model.dfy.Hotel.request;
 
 import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
@@ -10,7 +10,5 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class HotelDetailRequest extends DfyBaseData {
 
-
-
-        private Long hotelId;
+    private Long hotelId;
 }

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

@@ -1,4 +1,4 @@
-package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
+package com.zswl.cloud.springBatch.client.model.dfy.Hotel.request;
 
 import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;

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

@@ -1,4 +1,4 @@
-package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
+package com.zswl.cloud.springBatch.client.model.dfy.Hotel.request;
 
 import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;

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

@@ -1,4 +1,4 @@
-package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
+package com.zswl.cloud.springBatch.client.model.dfy.Hotel.request;
 
 import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;

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

@@ -0,0 +1,38 @@
+package com.zswl.cloud.springBatch.client.model.dfy.Hotel.request;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RatePlanInfoRequest extends DfyBaseData {
+
+    // 酒店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 → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Hotel/request/RatePlanRequest.java

@@ -1,4 +1,4 @@
-package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request;
+package com.zswl.cloud.springBatch.client.model.dfy.Hotel.request;
 
 import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;

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

@@ -0,0 +1,30 @@
+package com.zswl.cloud.springBatch.client.model.dfy.Hotel.request;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SubmitOrderRequest extends DfyBaseData {
+
+    @ApiModelProperty(value = "笛风系统管理员账号")
+    private String acctId;
+
+    @ApiModelProperty(value = "订单ID")
+    private int orderId;
+
+    @ApiModelProperty(value = "支付方式", allowableValues = "1, 3")
+    private int payType;
+
+    @ApiModelProperty(value = "付款金额（单位元，不支持小数）")
+    private String pay;
+
+    @ApiModelProperty(value = "平台标识", allowableValues = "10001, 20000, 30001, 30002, 30003")
+    private String platform;
+
+
+}

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

@@ -1,13 +1,10 @@
-package com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.response;
+package com.zswl.cloud.springBatch.client.model.dfy.Hotel.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

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Hotel/response/CancelOrderResponse.java

@@ -0,0 +1,36 @@
+package com.zswl.cloud.springBatch.client.model.dfy.Hotel.response;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CancelOrderResponse extends DfyResponseBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Datas {
+
+        @ApiModelProperty(value = "执行成功标识")
+        private Boolean success;
+
+        @ApiModelProperty(value = "错误描述")
+        private String msg;
+
+        @ApiModelProperty(value = "错误码")
+        private Integer errorCode;
+
+        @ApiModelProperty(value = "数据")
+        private Object data;
+    }
+
+
+}

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

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

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

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

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

@@ -0,0 +1,132 @@
+package com.zswl.cloud.springBatch.client.model.dfy.Hotel.response;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderDetailResponse extends DfyResponseBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Datas {
+
+        private ContactInfo contactInfo; // 是否下单成功
+        private HotelInfo hotelInfo; // 订单Id
+        private OrderInfo orderInfo; // 笛风订单号是否新生成，1：是，0：否
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class ContactInfo {
+
+        @ApiModelProperty(value = "分销商联系人姓名")
+        private String contactName;
+
+        @ApiModelProperty(value = "分销商联系人电话")
+        private String contactPhone;
+
+        @ApiModelProperty(value = "分销商联系人邮箱")
+        private String contactEmail;
+
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class HotelInfo {
+
+        @ApiModelProperty(value = "酒店Id")
+        private Long hotelId;
+
+        @ApiModelProperty(value = "酒店名称")
+        private String hotelName;
+
+        @ApiModelProperty(value = "酒店地址")
+        private String hotelAddress;
+
+        @ApiModelProperty(value = "酒店电话")
+        private String hotelTel;
+
+        @ApiModelProperty(value = "物理房型类型")
+        private String roomType;
+
+        @ApiModelProperty(value = "物理房型名称")
+        private String roomName;
+
+        @ApiModelProperty(value = "床型")
+        private String bedType;
+
+        @ApiModelProperty(value = "早餐（文本描述）")
+        private String breakfastDesc;
+
+        @ApiModelProperty(value = "早餐（结构化）")
+        private RatePlanInfoResponse.Meal meal;
+
+        @ApiModelProperty(value = "取消政策（文本描述）")
+        private String cancelRule;
+
+        @ApiModelProperty(value = "取消政策（结构化）")
+        private RatePlanInfoResponse.Refund refund;
+
+        @ApiModelProperty(value = "发票开具方式", allowableValues = "0, 1")
+        private Integer invoiceType;
+
+        @ApiModelProperty(value = "最大可入住人数")
+        private Integer maxOccupancy;
+
+        @ApiModelProperty(value = "有线宽带", allowableValues = "FREE, NONE, PART_CHARGE, PART_SUPPORT_AND_CHARGE, CHARGE, UNKNOWN, PART_SUPPORT_AND_FREE, PART_SUPPORT_AND_PART_CHARGE")
+        private String broadband;
+
+        @ApiModelProperty(value = "无线wifi", allowableValues = "FREE, NONE, PART_CHARGE, PART_SUPPORT_AND_CHARGE, CHARGE, UNKNOWN, PART_SUPPORT_AND_FREE, PART_SUPPORT_AND_PART_CHARGE")
+        private String wifi;
+
+
+    }
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class OrderInfo {
+
+        @ApiModelProperty(value = "总价")
+        private Integer totalPrice;
+
+        @ApiModelProperty(value = "入店日期")
+        private String checkin;
+
+        @ApiModelProperty(value = "离店日期")
+        private String checkout;
+
+        @ApiModelProperty(value = "预订房间数")
+        private Integer numberofRooms;
+
+        @ApiModelProperty(value = "订单状态", allowableValues = "待付款, 酒店确认中, 确认失败, 已确认, 已取消, 已完成")
+        private String orderStatus;
+
+        @ApiModelProperty(value = "下单时间")
+        private String orderTime;
+
+        @ApiModelProperty(value = "已支付金额")
+        private Integer payedPrice;
+
+        @ApiModelProperty(value = "确认号")
+        private String confirmationNumber;
+
+
+    }
+
+
+}

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

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

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

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

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

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

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

@@ -0,0 +1,40 @@
+package com.zswl.cloud.springBatch.client.model.dfy.Hotel.response;
+
+import com.zswl.cloud.springBatch.client.model.dfy.DfyResponseBase;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SubmitOrderResponse extends DfyResponseBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Datas {
+
+        @ApiModelProperty(value = "笛风系统管理员账号")
+        private String acctId;
+
+        @ApiModelProperty(value = "订单ID")
+        private int orderId;
+
+        @ApiModelProperty(value = "支付方式", allowableValues = "1, 3")
+        private int payType;
+
+        @ApiModelProperty(value = "付款金额（单位元，不支持小数）")
+        private String pay;
+
+        @ApiModelProperty(value = "平台标识", allowableValues = "10001, 20000, 30001, 30002, 30003")
+        private String platform;
+
+    }
+
+
+}

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

@@ -10,6 +10,5 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class DetailRequest extends DfyBaseData {
 
-    private Integer page;
-    private Integer pageSize;
+    private Integer productId;
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/service/DfyHotelService.java

@@ -1,8 +1,51 @@
 package com.zswl.cloud.springBatch.client.service;
 
+import com.github.microservice.auth.client.content.ResultContent;
+import com.zswl.cloud.springBatch.client.model.dfy.Hotel.request.*;
+import com.zswl.cloud.springBatch.client.model.dfy.Hotel.response.*;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 @FeignClient(name = "springbatchservice/manager/dfy/hotel")
 public interface DfyHotelService {
 
+    @ApiOperation(" 目的地搜索")
+    @RequestMapping(value = "queryNew", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<QueryNewResponse> queryNew(@RequestBody QueryNewRequest queryNewRequest);
+
+    @ApiOperation(" 酒店搜索接口")
+    @RequestMapping(value = "hotelList", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<HotelListResponse> hotelList(@RequestBody HotelListRequest hotelListRequest);
+
+    @ApiOperation(" 酒店详情接口")
+    @RequestMapping(value = "hotelDetail", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<HotelDetailResponse> hotelDetail(@RequestBody HotelDetailRequest hotelDetailRequest);
+
+    @ApiOperation(" 房型及报价查询接口")
+    @RequestMapping(value = "ratePlanInfo", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<RatePlanInfoResponse> ratePlanInfo(@RequestBody RatePlanInfoRequest ratePlanInfoRequest);
+
+    @ApiOperation(" 实时询价接口")
+    @RequestMapping(value = "ratePlan", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<RatePlanResponse> ratePlan(@RequestBody RatePlanRequest ratePlanRequest);
+
+    @ApiOperation(" 创建订单接口")
+    @RequestMapping(value = "addOrder", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<AddOrderResponse> addOrder(@RequestBody AddOrderRequest addOrderRequest);
+
+    @ApiOperation(" 订单详情接口")
+    @RequestMapping(value = "orderDetail", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<OrderDetailResponse> orderDetail(@RequestBody OrderDetailRequest orderDetailRequest);
+
+    @ApiOperation(" 付款(代扣)接口")
+    @RequestMapping(value = "submitOrder", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<SubmitOrderResponse> submitOrder(@RequestBody SubmitOrderRequest submitOrderRequest);
+
+    @ApiOperation(" 取消订单接口")
+    @RequestMapping(value = "cancelOrder", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<CancelOrderResponse> cancelOrder(CancelOrderRequest cancelOrderRequest);
 }

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

@@ -4,8 +4,8 @@ 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.Hotel.request.*;
+import com.zswl.cloud.springBatch.client.model.dfy.Hotel.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;
@@ -31,19 +31,78 @@ public class DomesticHotelApi {
     @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);
 
     }
 
+    public HotelListResponse hotelList(HotelListRequest hotelListRequest) {
+
+        String post = post(hotelListRequest, "/DomesticHotel/query/hotelList");
+        return JSONUtil.toBean(post, HotelListResponse.class);
+
+    }
+
+    public HotelDetailResponse hotelDetail(HotelDetailRequest hotelDetailRequest) {
+
+        String post = post(hotelDetailRequest, "/DomesticHotel/query/hotelDetail");
+        return JSONUtil.toBean(post, HotelDetailResponse.class);
+
+    }
+
+    public RatePlanInfoResponse ratePlanInfo(RatePlanInfoRequest ratePlanInfoRequest) {
+
+        String post = post(ratePlanInfoRequest, "/DomesticHotel/query/ratePlanInfo");
+        return JSONUtil.toBean(post, RatePlanInfoResponse.class);
+
+    }
+
+    public RatePlanResponse ratePlan(RatePlanRequest ratePlanRequest) {
+
+        String post = post(ratePlanRequest, "/DomesticHotel/realTime/ratePlan");
+        return JSONUtil.toBean(post, RatePlanResponse.class);
+
+    }
+
+    public AddOrderResponse addOrder(AddOrderRequest addOrderRequest) {
+
+        addOrderRequest.setAcctId(acctId);
+        String post = post(addOrderRequest, "/DomesticHotel/query/addOrder");
+        return JSONUtil.toBean(post, AddOrderResponse.class);
+
+    }
+
+    public OrderDetailResponse orderDetail(OrderDetailRequest orderDetailRequest) {
+
+        String post = post(orderDetailRequest, "/DomesticHotel/query/orderDetail");
+        return JSONUtil.toBean(post, OrderDetailResponse.class);
+
+    }
+
+
+    public SubmitOrderResponse submitOrder(SubmitOrderRequest submitOrderRequest) {
+
+        submitOrderRequest.setAcctId(acctId);
+        String post = post(submitOrderRequest, "/DomesticHotel/submitOrder");
+        return JSONUtil.toBean(post, SubmitOrderResponse.class);
+
+    }
+
+    public CancelOrderResponse cancelOrder(CancelOrderRequest cancelOrderRequest) {
+
+        cancelOrderRequest.setAcctId(acctId);
+        String post = post(cancelOrderRequest, "/DomesticHotel/query/cancelOrder");
+        return JSONUtil.toBean(post, CancelOrderResponse.class);
+
+    }
+
     private String post(DfyBaseData dfyBaseData, String url) {
 
-        DfyRequestBase dfyRequestBase= new DfyRequestBase(dfyBaseData);
+        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

@@ -73,6 +73,7 @@ public class TicketApi {
     // 创建订单接口
     public CreateOrderNewResponse createOrderNew(CreateOrderNewRequest createOrderNewRequest) {
 
+        createOrderNewRequest.setAcctId(acctId);
         String post = post(createOrderNewRequest, "/Ticket/createOrderNew");
         return JSONUtil.toBean(post, CreateOrderNewResponse.class);
     }
@@ -86,12 +87,14 @@ public class TicketApi {
 
     // 出票(代扣)接口
     public SubmitOrderResponse submitOrderResponse(SubmitOrderRequest submitOrderRequest) {
+        submitOrderRequest.setAcctId(acctId);
         String post = post(submitOrderRequest, "/Ticket/submitOrder");
         return JSONUtil.toBean(post, SubmitOrderResponse.class);
     }
 
     // 订单详情接口
     public OrderDetailResponse orderDetail(OrderDetailRequest orderDetailRequest) {
+        orderDetailRequest.setAcctId(acctId);
         String post = post(orderDetailRequest, "/Ticket/orderDetail");
         return JSONUtil.toBean(post, OrderDetailResponse.class);
     }

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/DfyHotelController.java

@@ -0,0 +1,86 @@
+package com.zswl.cloud.springBtach.server.core.controller;
+
+
+import com.github.microservice.auth.client.content.ResultContent;
+import com.zswl.cloud.springBatch.client.model.dfy.Hotel.request.*;
+import com.zswl.cloud.springBatch.client.model.dfy.Hotel.response.*;
+import com.zswl.cloud.springBatch.client.service.DfyHotelService;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@Log4j2
+@RestController
+@RequestMapping("dfy/hotel")
+public class DfyHotelController {
+
+    @Autowired
+    DfyHotelService dfyHotelService;
+
+    @ApiOperation(" 目的地搜索")
+    @RequestMapping(value = "queryNew", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<QueryNewResponse> queryNew(@RequestBody QueryNewRequest queryNewRequest) {
+        return dfyHotelService.queryNew(queryNewRequest);
+    }
+
+
+    @ApiOperation(" 酒店搜索接口")
+    @RequestMapping(value = "hotelList", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<HotelListResponse> hotelList(@RequestBody HotelListRequest hotelListRequest) {
+        return dfyHotelService.hotelList(hotelListRequest);
+    }
+
+
+    @ApiOperation(" 酒店详情接口")
+    @RequestMapping(value = "hotelDetail", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<HotelDetailResponse> hotelDetail(@RequestBody HotelDetailRequest hotelDetailRequest) {
+        return dfyHotelService.hotelDetail(hotelDetailRequest);
+    }
+
+
+    @ApiOperation(" 房型及报价查询接口")
+    @RequestMapping(value = "ratePlanInfo", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<RatePlanInfoResponse> ratePlanInfo(@RequestBody RatePlanInfoRequest ratePlanInfoRequest) {
+        return dfyHotelService.ratePlanInfo(ratePlanInfoRequest);
+    }
+
+
+    @ApiOperation(" 实时询价接口")
+    @RequestMapping(value = "ratePlan", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<RatePlanResponse> ratePlan(@RequestBody RatePlanRequest ratePlanRequest) {
+        return dfyHotelService.ratePlan(ratePlanRequest);
+    }
+
+
+    @ApiOperation(" 创建订单接口")
+    @RequestMapping(value = "addOrder", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<AddOrderResponse> addOrder(@RequestBody AddOrderRequest addOrderRequest) {
+        return dfyHotelService.addOrder(addOrderRequest);
+    }
+
+    @ApiOperation(" 订单详情接口")
+    @RequestMapping(value = "orderDetail", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<OrderDetailResponse> orderDetail(@RequestBody OrderDetailRequest orderDetailRequest) {
+        return dfyHotelService.orderDetail(orderDetailRequest);
+    }
+
+
+    @ApiOperation(" 付款(代扣)接口")
+    @RequestMapping(value = "submitOrder", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<SubmitOrderResponse> submitOrder(@RequestBody SubmitOrderRequest submitOrderRequest) {
+        return dfyHotelService.submitOrder(submitOrderRequest);
+    }
+
+
+    @ApiOperation(" 取消订单接口")
+    @RequestMapping(value = "cancelOrder", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<CancelOrderResponse> cancelOrder(CancelOrderRequest cancelOrderRequest) {
+        return dfyHotelService.cancelOrder(cancelOrderRequest);
+    }
+
+}

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/manager/DfyHotelManageController.groovy

@@ -0,0 +1,18 @@
+package com.zswl.cloud.springBtach.server.core.controller.manager
+
+import com.zswl.cloud.springBatch.client.service.DfyHotelService
+import com.zswl.cloud.springBatch.client.service.DfyTicketService
+import com.zswl.cloud.springBatch.client.service.OrderService
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+
+@RestController
+@RequestMapping("manager/dfy/hotel")
+class DfyHotelManageController {
+
+    @Autowired
+    @Delegate(methodAnnotations = true, parameterAnnotations = true, includeTypes = OrderService.class, interfaces = false)
+    private DfyHotelService dfyHotelService;
+}

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/DfyHotelServiceImpl.java

@@ -1,5 +1,8 @@
 package com.zswl.cloud.springBtach.server.core.service.impl;
 
+import com.github.microservice.auth.client.content.ResultContent;
+import com.zswl.cloud.springBatch.client.model.dfy.Hotel.request.*;
+import com.zswl.cloud.springBatch.client.model.dfy.Hotel.response.*;
 import com.zswl.cloud.springBatch.client.service.DfyHotelService;
 import com.zswl.cloud.springBtach.server.core.api.dfy.DomesticHotelApi;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,4 +13,40 @@ public class DfyHotelServiceImpl implements DfyHotelService {
 
     @Autowired
     DomesticHotelApi domesticHotelApi;
+
+    public ResultContent<QueryNewResponse> queryNew(QueryNewRequest queryNewRequest) {
+        return ResultContent.buildContent(domesticHotelApi.queryNew(queryNewRequest));
+    }
+
+    public ResultContent<HotelListResponse> hotelList(HotelListRequest hotelListRequest) {
+        return ResultContent.buildContent(domesticHotelApi.hotelList(hotelListRequest));
+    }
+
+    public ResultContent<HotelDetailResponse> hotelDetail(HotelDetailRequest hotelDetailRequest) {
+        return ResultContent.buildContent(domesticHotelApi.hotelDetail(hotelDetailRequest));
+    }
+
+    public ResultContent<RatePlanInfoResponse> ratePlanInfo(RatePlanInfoRequest ratePlanInfoRequest) {
+        return ResultContent.buildContent(domesticHotelApi.ratePlanInfo(ratePlanInfoRequest));
+    }
+
+    public ResultContent<RatePlanResponse> ratePlan(RatePlanRequest ratePlanRequest) {
+        return ResultContent.buildContent(domesticHotelApi.ratePlan(ratePlanRequest));
+    }
+
+    public ResultContent<AddOrderResponse> addOrder(AddOrderRequest addOrderRequest) {
+        return ResultContent.buildContent(domesticHotelApi.addOrder(addOrderRequest));
+    }
+
+    public ResultContent<OrderDetailResponse> orderDetail(OrderDetailRequest orderDetailRequest) {
+        return ResultContent.buildContent(domesticHotelApi.orderDetail(orderDetailRequest));
+    }
+
+    public ResultContent<SubmitOrderResponse> submitOrder(SubmitOrderRequest submitOrderRequest) {
+        return ResultContent.buildContent(domesticHotelApi.submitOrder(submitOrderRequest));
+    }
+
+    public ResultContent<CancelOrderResponse> cancelOrder(CancelOrderRequest cancelOrderRequest) {
+        return ResultContent.buildContent(domesticHotelApi.cancelOrder(cancelOrderRequest));
+    }
 }