dfy api

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

@@ -0,0 +1,15 @@
+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;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderDetailRequest extends DfyBaseData {
+
+    private Integer orderId; // 订单ID
+    private Integer Integer; // 账号Id
+}

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

@@ -0,0 +1,37 @@
+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/service/DfyHotelService.java

@@ -0,0 +1,8 @@
+package com.zswl.cloud.springBatch.client.service;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(name = "springbatchservice/manager/dfy/hotel")
+public interface DfyHotelService {
+
+}

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

@@ -0,0 +1,62 @@
+package com.zswl.cloud.springBatch.client.service;
+
+import com.github.microservice.auth.client.content.ResultContent;
+import com.zswl.cloud.springBatch.client.model.dfy.Ticket.request.*;
+import com.zswl.cloud.springBatch.client.model.dfy.Ticket.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/ticket")
+public interface DfyTicketService {
+
+
+    @ApiOperation(" 景点列表查询")
+    @RequestMapping(value = "scenicList", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<ScenicListResponse> scenicList(@RequestBody ScenicListRequest scenicListRequest);
+
+    @ApiOperation(" 景点详情接口")
+    @RequestMapping(value = "scenicDetail", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<ScenicDetailResponse> scenicDetail(@RequestBody ScenicDetailRequest scenicDetailRequest);
+
+    @ApiOperation(" 特权门票查询接口")
+    @RequestMapping(value = "privilegeTicketList", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<PrivilegeTicketListResponse> privilegeTicketList(@RequestBody PrivilegeTicketListRequest privilegeTicketListRequest);
+
+    @ApiOperation(" 门票详情接口")
+    @RequestMapping(value = "detail", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<DetailResponse> detail(@RequestBody DetailRequest detailRequest);
+
+    @ApiOperation(" 创建订单接口")
+    @RequestMapping(value = "createOrderNew", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<CreateOrderNewResponse> createOrderNew(@RequestBody CreateOrderNewRequest createOrderNewRequest);
+
+    @ApiOperation(" 取消订单")
+    @RequestMapping(value = "cancelOrder", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent cancelOrder(@RequestBody CancelOrderRequest cancelOrderRequest);
+
+    @ApiOperation(" 出票(代扣)接口")
+    @RequestMapping(value = "submitOrderResponse", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<SubmitOrderResponse> submitOrderResponse(@RequestBody SubmitOrderRequest submitOrderRequest);
+
+    @ApiOperation(" 订单详情接口")
+    @RequestMapping(value = "orderDetail", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<OrderDetailResponse> orderDetail(@RequestBody OrderDetailRequest orderDetailRequest);
+
+    @ApiOperation(" 订单状态接口")
+    @RequestMapping(value = "orderStatus", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<OrderStatusResponse> orderStatus(@RequestBody OrderStatusRequest orderStatusRequest);
+
+    @ApiOperation(" 核销查询接口")
+    @RequestMapping(value = "verifyOrder", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<VerifyOrderResponse> verifyOrder(@RequestBody VerifyOrderRequest verifyOrderRequest);
+
+    @ApiOperation(" 退票申请接口")
+    @RequestMapping(value = "tuiPiao", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<TuiPiaoResponse> tuiPiao(@RequestBody TuiPiaoRequest tuiPiaoRequest);
+
+
+}

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

@@ -0,0 +1,116 @@
+package com.zswl.cloud.springBtach.server.core.controller;
+
+
+import com.github.microservice.auth.client.constant.AuthConstant;
+import com.github.microservice.auth.client.content.ResultContent;
+import com.github.microservice.auth.security.annotations.ResourceAuth;
+import com.github.microservice.auth.security.type.AuthType;
+import com.zswl.cloud.springBatch.client.model.dfy.Ticket.request.*;
+import com.zswl.cloud.springBatch.client.model.dfy.Ticket.response.*;
+import com.zswl.cloud.springBatch.client.service.DfyTicketService;
+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/ticket")
+public class DfyTicketController {
+
+    @Autowired
+    DfyTicketService dfyTicketService;
+
+
+    @ApiOperation(" 景点列表查询")
+    @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
+    @RequestMapping(value = "scenicList", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<ScenicListResponse> scenicList(@RequestBody ScenicListRequest scenicListRequest) {
+        return dfyTicketService.scenicList(scenicListRequest);
+    }
+
+
+    @ApiOperation(" 景点详情接口")
+    @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
+    @RequestMapping(value = "scenicDetail", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<ScenicDetailResponse> scenicDetail(@RequestBody ScenicDetailRequest scenicDetailRequest) {
+        return dfyTicketService.scenicDetail(scenicDetailRequest);
+    }
+
+
+    @ApiOperation(" 特权门票查询接口")
+    @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
+    @RequestMapping(value = "privilegeTicketList", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<PrivilegeTicketListResponse> privilegeTicketList(@RequestBody PrivilegeTicketListRequest privilegeTicketListRequest) {
+        return dfyTicketService.privilegeTicketList(privilegeTicketListRequest);
+    }
+
+
+    @ApiOperation(" 门票详情接口")
+    @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
+    @RequestMapping(value = "detail", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<DetailResponse> detail(@RequestBody DetailRequest detailRequest) {
+        return dfyTicketService.detail(detailRequest);
+    }
+
+
+    @ApiOperation(" 创建订单接口")
+    @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
+    @RequestMapping(value = "createOrderNew", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<CreateOrderNewResponse> createOrderNew(@RequestBody CreateOrderNewRequest createOrderNewRequest) {
+        return dfyTicketService.createOrderNew(createOrderNewRequest);
+    }
+
+
+    @ApiOperation(" 取消订单")
+    @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
+    @RequestMapping(value = "cancelOrder", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent cancelOrder(@RequestBody CancelOrderRequest cancelOrderRequest) {
+        return dfyTicketService.cancelOrder(cancelOrderRequest);
+    }
+
+
+    @ApiOperation(" 出票(代扣)接口")
+    @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
+    @RequestMapping(value = "submitOrderResponse", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<SubmitOrderResponse> submitOrderResponse(@RequestBody SubmitOrderRequest submitOrderRequest) {
+        return dfyTicketService.submitOrderResponse(submitOrderRequest);
+    }
+
+
+    @ApiOperation(" 订单详情接口")
+    @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
+    @RequestMapping(value = "orderDetail", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<OrderDetailResponse> orderDetail(@RequestBody OrderDetailRequest orderDetailRequest) {
+        return dfyTicketService.orderDetail(orderDetailRequest);
+    }
+
+
+    @ApiOperation(" 订单状态接口")
+    @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
+    @RequestMapping(value = "orderStatus", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<OrderStatusResponse> orderStatus(@RequestBody OrderStatusRequest orderStatusRequest) {
+        return dfyTicketService.orderStatus(orderStatusRequest);
+    }
+
+
+    @ApiOperation(" 核销查询接口")
+    @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
+    @RequestMapping(value = "verifyOrder", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<VerifyOrderResponse> verifyOrder(@RequestBody VerifyOrderRequest verifyOrderRequest) {
+        return dfyTicketService.verifyOrder(verifyOrderRequest);
+    }
+
+
+    @ApiOperation(" 退票申请接口")
+    @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
+    @RequestMapping(value = "tuiPiao", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<TuiPiaoResponse> tuiPiao(@RequestBody TuiPiaoRequest tuiPiaoRequest) {
+        return dfyTicketService.tuiPiao(tuiPiaoRequest);
+    }
+
+}

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

@@ -11,7 +11,6 @@ import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.payment.client.model.order.*;
 import com.zhongshu.payment.client.model.order.v2.CreateOrder2Model;
-import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
 import com.zhongshu.payment.client.model.order.v2.OrderResult2Model;
 import com.zhongshu.payment.client.model.payment.CreateResponseModel;
 import com.zhongshu.payment.client.type.JobFlowMap;
@@ -21,7 +20,7 @@ import com.zswl.cloud.shop.client.service.GoodsService;
 import com.zswl.cloud.shop.client.service.ShopService;
 import com.zswl.cloud.shop.client.vo.life.GoodsInfoVo;
 import com.zswl.cloud.shop.client.vo.life.ShopDetailVo;
-import com.zswl.cloud.springBtach.server.core.service.OrderServiceImp;
+import com.zswl.cloud.springBtach.server.core.service.impl.OrderServiceImpl;
 import io.swagger.annotations.ApiOperation;
 import lombok.SneakyThrows;
 import lombok.extern.log4j.Log4j2;
@@ -45,7 +44,7 @@ public class OrderController {
     AuthHelper authHelper;
 
     @Autowired
-    OrderServiceImp orderServiceImp;
+    OrderServiceImpl orderServiceImp;
 
     @Autowired
     GoodsService goodsService;

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

@@ -0,0 +1,17 @@
+package com.zswl.cloud.springBtach.server.core.controller.manager
+
+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/ticket")
+class DfyTicketManagerController {
+
+
+    @Autowired
+    @Delegate(methodAnnotations = true, parameterAnnotations = true, includeTypes = OrderService.class, interfaces = false)
+    private DfyTicketService dfyTicketService;
+}

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

@@ -0,0 +1,13 @@
+package com.zswl.cloud.springBtach.server.core.service.impl;
+
+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;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DfyHotelServiceImpl implements DfyHotelService {
+
+    @Autowired
+    DomesticHotelApi domesticHotelApi;
+}

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

@@ -0,0 +1,78 @@
+package com.zswl.cloud.springBtach.server.core.service.impl;
+
+import com.github.microservice.auth.client.content.ResultContent;
+import com.github.microservice.auth.client.content.ResultState;
+import com.zswl.cloud.springBatch.client.model.dfy.Ticket.request.*;
+import com.zswl.cloud.springBatch.client.model.dfy.Ticket.response.*;
+import com.zswl.cloud.springBatch.client.service.DfyTicketService;
+import com.zswl.cloud.springBtach.server.core.api.dfy.TicketApi;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DfyTicketServiceImpl implements DfyTicketService {
+
+    @Autowired
+    TicketApi ticketApi;
+
+
+    public ResultContent<ScenicListResponse> scenicList(ScenicListRequest scenicListRequest) {
+        return ResultContent.buildContent(ticketApi.scenicList(scenicListRequest));
+    }
+
+
+    public ResultContent<ScenicDetailResponse> scenicDetail(ScenicDetailRequest scenicDetailRequest) {
+        return ResultContent.buildContent(ticketApi.scenicDetail(scenicDetailRequest));
+    }
+
+
+    public ResultContent<PrivilegeTicketListResponse> privilegeTicketList(PrivilegeTicketListRequest privilegeTicketListRequest) {
+        return ResultContent.buildContent(ticketApi.privilegeTicketList(privilegeTicketListRequest));
+    }
+
+
+    public ResultContent<DetailResponse> detail(DetailRequest detailRequest) {
+        return ResultContent.buildContent(ticketApi.detail(detailRequest));
+    }
+
+
+    public ResultContent<CreateOrderNewResponse> createOrderNew(CreateOrderNewRequest createOrderNewRequest) {
+        return ResultContent.buildContent(ticketApi.createOrderNew(createOrderNewRequest));
+    }
+
+
+    public ResultContent cancelOrder(CancelOrderRequest cancelOrderRequest) {
+        ticketApi.cancelOrder(cancelOrderRequest);
+        return ResultContent.build(ResultState.Success);
+    }
+
+
+    public ResultContent<SubmitOrderResponse> submitOrderResponse(SubmitOrderRequest submitOrderRequest) {
+        return ResultContent.buildContent(ticketApi.submitOrderResponse(submitOrderRequest));
+
+    }
+
+
+    public ResultContent<OrderDetailResponse> orderDetail(OrderDetailRequest orderDetailRequest) {
+        return ResultContent.buildContent(ticketApi.orderDetail(orderDetailRequest));
+
+    }
+
+
+    public ResultContent<OrderStatusResponse> orderStatus(OrderStatusRequest orderStatusRequest) {
+        return ResultContent.buildContent(ticketApi.orderStatus(orderStatusRequest));
+
+    }
+
+
+    public ResultContent<VerifyOrderResponse> verifyOrder(VerifyOrderRequest verifyOrderRequest) {
+        return ResultContent.buildContent(ticketApi.verifyOrder(verifyOrderRequest));
+
+    }
+
+
+    public ResultContent<TuiPiaoResponse> tuiPiao(TuiPiaoRequest tuiPiaoRequest) {
+        return ResultContent.buildContent(ticketApi.tuiPiao(tuiPiaoRequest));
+
+    }
+}

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/OrderServiceImp.java → SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/OrderServiceImpl.java

@@ -1,4 +1,4 @@
-package com.zswl.cloud.springBtach.server.core.service;
+package com.zswl.cloud.springBtach.server.core.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 
 @Service
-public class OrderServiceImp implements OrderService {
+public class OrderServiceImpl implements OrderService {
 
     @Autowired
     private StandarOrderJob standardOrderJob;