gongfuzhu 1 năm trước cách đây
mục cha
commit
a1c1a082b2

+ 27 - 0
SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/request/OrderDetailRequest.java

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

+ 34 - 0
SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/request/SubmitOrderRequest.java

@@ -0,0 +1,34 @@
+package com.zswl.cloud.springBatch.client.model.dfy.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SubmitOrderRequest extends DfyRequestBase{
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Datas {
+        // 笛风系统管理员账号
+        private String acctId;
+
+        // 订单ID
+        private int orderId;
+
+        // 支付方式.1:途牛钱包代扣 3.企业支付宝代扣
+        private int payType;
+
+        // 付款金额(单位元,不支持小数)
+        private int pay;
+
+        // 平台标识(10001:PC,20000:m站,30001:app安卓,30002:appIOS,30003:appWindows)(默认是pc)
+        private String platform;
+    }
+}

+ 190 - 0
SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/response/OrderDetailResponse.java

@@ -0,0 +1,190 @@
+package com.zswl.cloud.springBatch.client.model.dfy.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderDetailResponse extends DfyResponseBase {
+
+    private Datas data;
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Datas {
+
+        // 订单id
+        private int orderId;
+
+        // 支付开关 0.不可支付,1.可以支付;分销商系统需要控制,当canPay="1"时,才调用【出票(代扣)接口】。
+        private String canPay;
+
+        // 产品ID
+        private Integer productId;
+
+        // 景点ID
+        private Integer scenicId;
+
+        // 景点名称
+        private String scenicName;
+
+        // 订单状态
+        private String orderStatus;
+
+        // 下单时间
+        private String orderTime;
+
+        // 出游日期
+        private String planDate;
+
+        // 预订数量
+        private Integer bookNumber;
+
+        // 总价
+        private Integer amoutPrice;
+
+        // 取票地址
+        private String pickUpAddress;
+
+        // 凭证码(“已完成”状态有值)
+        private String externalOrderId;
+
+        // 取票人信息
+        private Contact contact;
+
+        // 出游人信息
+        private List<Tourist> touristList;
+
+        // 入园方式及凭证信息
+        private EnterCertificate enterCertificate;
+
+
+        // 门票配送信息
+        private Delivery delivery;
+
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Contact {
+
+        // 取票人姓名
+        private String contactName;
+
+        // 取票人邮箱
+        private String contactEmail;
+
+        // 取票人手机号码
+        private String contactTel;
+
+        // 证件类型:1、二代身份证2、护照3、军官证4、港澳通行证7、台胞证8、回乡证9、户口簿10、出生证明11、台湾通行证
+        private Integer psptType;
+
+        // 证件号码
+        private String psptId;
+    }
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Tourist {
+
+        // 游客姓名
+        private String name;
+
+        // 证件类型:1、二代身份证2、护照3、军官证4、港澳通行证7、台胞证8、回乡证9、户口簿10、出生证明11、台湾通行证
+        private Integer psptType;
+
+        // 证件号码
+        private String psptId;
+
+        // 电话号码
+        private String tel;
+
+        // 邮箱
+        private String email;
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class EnterCertificate {
+
+        // 入园方式
+        private String enterCertificateType;
+
+        // 入园凭证附件
+        private EnterCertificateTypeInfo enterCertificateTypeInfo;
+
+        // 入园凭证文本说明
+        private String enterCertificateTxt;
+
+    }
+
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class EnterCertificateTypeInfo {
+
+        // 资源ID
+        private Integer resourceId;
+
+        private Integer requirementId;
+
+        // 凭证对象 可能有多个
+        private List<TicketCertInfo> ticketCertInfos;
+
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class TicketCertInfo {
+
+        // 凭证类型   1.纯文本  2.二维码 3.PDF
+        private Integer certType;
+
+
+        // 凭证文本或者URL
+        private List<String> fileUrls;
+
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public class Delivery {
+
+        // 配送类型:1配送 2自取
+        private Integer deliveryType;
+
+        // 收件人
+        private String receiverName;
+
+        // 收件电话
+        private String telNum;
+
+        // 收件地址
+        private String deliveryEndAddress;
+
+        // 邮编
+        private String zipCode;
+
+
+    }
+
+
+
+}

+ 29 - 0
SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/response/SubmitOrderResponse.java

@@ -0,0 +1,29 @@
+package com.zswl.cloud.springBatch.client.model.dfy.response;
+
+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 {
+
+        // 笛风订单号
+        private int orderId;
+
+        // 交易流水号
+        private int outTradeNo;
+
+
+    }
+
+}

+ 0 - 12
SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/response/TicketProduct.java

@@ -1,12 +0,0 @@
-package com.zswl.cloud.springBatch.client.model.dfy.response;
-
-public class TicketProduct {
-
-
-    // Constructor
-    public TicketProduct() {
-    }
-
-    // Getters and setters
-    // Add getters and setters for each field here
-}

+ 1 - 1
SpringBatchServiceServer/pom.xml

@@ -54,7 +54,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.8.18</version>
+            <version>5.8.27</version>
         </dependency>
 
         <dependency>

+ 7 - 0
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/api/dfy/DiFengYunApi.java

@@ -79,6 +79,13 @@ public class DiFengYunApi {
     }
 
 
+    // 出票(代扣)接口
+    public SubmitOrderResponse SubmitOrderResponse(SubmitOrderRequest submitOrderRequest) {
+        String post = post(submitOrderRequest, "/Ticket/submitOrder");
+        return JSONUtil.toBean(post, SubmitOrderResponse.class);
+    }
+
+
     private String post(DfyRequestBase dfyRequestBase, String url) {