From fd9af5ff421c0bd072319ea868f1a1753c6f6f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=A4=A9=E9=B9=8F?= Date: Tue, 16 Jan 2024 16:18:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=A2=9E=E5=8A=A0=E5=AE=9E=E5=90=8D=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B,=20=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8F=96=E4=BF=A1?= =?UTF-8?q?=E6=81=AF,=20=E6=BC=94=E5=87=BA=E8=AF=A6=E6=83=85=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=BF=94=E5=9B=9E=E5=80=BC=E5=A2=9E=E5=8A=A0=E6=BC=94?= =?UTF-8?q?=E5=87=BA=E9=99=90=E8=B4=AD=E4=BF=A1=E6=81=AF=E5=92=8C=E8=A7=82?= =?UTF-8?q?=E6=BC=94=E9=A1=BB=E7=9F=A5=E5=92=8C=E5=85=A5=E5=9C=BA=E5=87=AD?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/domain/activity/dto/ActivityDTO.java | 9 +++++++ .../dto/ActivityDetailSpecialInfoDTO.java | 19 ++++++++++++++ .../domain/activity/dto/ActivityTipDTO.java | 22 ++++++++++++++++ .../domain/activity/dto/OrderNumlimitDTO.java | 19 ++++++++++++++ .../open/api/domain/order/dto/IdCardDTO.java | 26 +++++++++++++++++++ .../open/api/domain/order/dto/OrderDTO.java | 10 +++++++ .../order/request/CreateOrderRequest.java | 6 ++++- .../piaoniu/open/api/enums/EnterTipType.java | 23 ++++++++++++++++ .../piaoniu/open/api/enums/IdCardType.java | 21 +++++++++++++++ 9 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityDetailSpecialInfoDTO.java create mode 100644 src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityTipDTO.java create mode 100644 src/main/java/com/piaoniu/open/api/domain/activity/dto/OrderNumlimitDTO.java create mode 100644 src/main/java/com/piaoniu/open/api/domain/order/dto/IdCardDTO.java create mode 100644 src/main/java/com/piaoniu/open/api/enums/EnterTipType.java create mode 100644 src/main/java/com/piaoniu/open/api/enums/IdCardType.java diff --git a/src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityDTO.java b/src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityDTO.java index 6dadce0..e957b00 100644 --- a/src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityDTO.java +++ b/src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityDTO.java @@ -46,4 +46,13 @@ public class ActivityDTO { private int weight; + /** + * 演出层面上的限购信息, 详情接口返回 + */ + private OrderNumlimitDTO orderNumLimit; + + /** + * 结构化的观演须知和入场凭证, 详情接口返回 + */ + private ActivityDetailSpecialInfoDTO specialInfo; } diff --git a/src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityDetailSpecialInfoDTO.java b/src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityDetailSpecialInfoDTO.java new file mode 100644 index 0000000..6a75b59 --- /dev/null +++ b/src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityDetailSpecialInfoDTO.java @@ -0,0 +1,19 @@ +package com.piaoniu.open.api.domain.activity.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +@Data +public class ActivityDetailSpecialInfoDTO implements Serializable { + /** + * 观演须知 + */ + List enterTips = new ArrayList<>(); + /** + * 入场凭证 + */ + List ticketTips = new ArrayList<>(); +} \ No newline at end of file diff --git a/src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityTipDTO.java b/src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityTipDTO.java new file mode 100644 index 0000000..057eaaa --- /dev/null +++ b/src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityTipDTO.java @@ -0,0 +1,22 @@ +package com.piaoniu.open.api.domain.activity.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ActivityTipDTO implements Serializable { + /** + * 须知标题 + */ + private String title; + /** + * 须知内容 + */ + private String desc; + /** + * 须知类型, EnterTipType枚举的value + * @see com.piaoniu.open.api.enums.EnterTipType + */ + private Integer type; +} \ No newline at end of file diff --git a/src/main/java/com/piaoniu/open/api/domain/activity/dto/OrderNumlimitDTO.java b/src/main/java/com/piaoniu/open/api/domain/activity/dto/OrderNumlimitDTO.java new file mode 100644 index 0000000..0f48b5b --- /dev/null +++ b/src/main/java/com/piaoniu/open/api/domain/activity/dto/OrderNumlimitDTO.java @@ -0,0 +1,19 @@ +package com.piaoniu.open.api.domain.activity.dto; + +import lombok.Data; + +@Data +public class OrderNumlimitDTO { + /** + * 单笔订单最小购买数量, 为0时无限制 + */ + private Integer numMin; + /** + * 单笔订单最大购买数量, 为0时无限制 + */ + private Integer numMax; + /** + * 订单数量限制, 为0时无限制 + */ + private Integer orderLimit; +} diff --git a/src/main/java/com/piaoniu/open/api/domain/order/dto/IdCardDTO.java b/src/main/java/com/piaoniu/open/api/domain/order/dto/IdCardDTO.java new file mode 100644 index 0000000..4c42a4f --- /dev/null +++ b/src/main/java/com/piaoniu/open/api/domain/order/dto/IdCardDTO.java @@ -0,0 +1,26 @@ +package com.piaoniu.open.api.domain.order.dto; + +import com.piaoniu.open.api.enums.IdCardType; +import lombok.Data; + +/** + * 证件信息 + */ +@Data +public class IdCardDTO { + /** + * 姓名 + */ + private String name; + + /** + * 证件号类型, 这里填IdCardType枚举的value, 为空时也视为1-身份证 + * @see com.piaoniu.open.api.enums.IdCardType + */ + private Integer idCardType; + + /** + * 证件号 + */ + private String idCard; +} diff --git a/src/main/java/com/piaoniu/open/api/domain/order/dto/OrderDTO.java b/src/main/java/com/piaoniu/open/api/domain/order/dto/OrderDTO.java index c7ddd60..d36e52e 100644 --- a/src/main/java/com/piaoniu/open/api/domain/order/dto/OrderDTO.java +++ b/src/main/java/com/piaoniu/open/api/domain/order/dto/OrderDTO.java @@ -33,6 +33,16 @@ public class OrderDTO { private OnSiteGetInfoDTO onSiteGetInfo; + /** + * 自取取票码, 仅在订单为现场自取且已支付时返回, 注意下单后取票码需要时间生成, 没返回该字段可用订单号:xxx替换取票码:xxx + */ + private String pnPickupCode; + + /** + * 自取二维码内容,仅在订单为现场自取且已支付时返回, 需要使用该字符串生成二维码, 商家可使用票牛商家版app扫码核销订单 + */ + private String pnPickupLink; + private List ticketReceipts; private ExpressInfoDTO expressInfo; diff --git a/src/main/java/com/piaoniu/open/api/domain/order/request/CreateOrderRequest.java b/src/main/java/com/piaoniu/open/api/domain/order/request/CreateOrderRequest.java index 6801a2f..2824b2f 100644 --- a/src/main/java/com/piaoniu/open/api/domain/order/request/CreateOrderRequest.java +++ b/src/main/java/com/piaoniu/open/api/domain/order/request/CreateOrderRequest.java @@ -8,7 +8,7 @@ import lombok.ToString; import java.math.BigDecimal; /** - * Created by slj on 16/12/26. + * 创建订单 */ @Data @ToString @@ -39,6 +39,10 @@ public class CreateOrderRequest implements BaseRequest { private String district; + /** + * 证件信息json数组字符串 + * @see com.piaoniu.open.api.domain.order.dto.IdCardDTO + */ private String idCards; /** * 邮费 diff --git a/src/main/java/com/piaoniu/open/api/enums/EnterTipType.java b/src/main/java/com/piaoniu/open/api/enums/EnterTipType.java new file mode 100644 index 0000000..615332f --- /dev/null +++ b/src/main/java/com/piaoniu/open/api/enums/EnterTipType.java @@ -0,0 +1,23 @@ +package com.piaoniu.open.api.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum EnterTipType { + CHILD(1, "儿童入场提示"), + FORBIDDEN(2, "禁止携带物品"), + SHOW_LANGUAGE(3, "演出语言"), + SHOW_FORMAT(4, "演出形式"), + DURATION(5, "演出时长"), + ENTER_TIME(6, "入场时间"), + RESTRICT(7, "限购说明"), + SEAT_TYPE(8, "座位类型"), + COUPON_LIMIT(9, "用券限制"), + PHYSICAL_TICKETS(10, "实体票"), + ELECTRONIC_TICKETS(11, "电子票"), + OTHER(99, "其他说明"); + private Integer value; + private String title; +} \ No newline at end of file diff --git a/src/main/java/com/piaoniu/open/api/enums/IdCardType.java b/src/main/java/com/piaoniu/open/api/enums/IdCardType.java new file mode 100644 index 0000000..8a2a3ce --- /dev/null +++ b/src/main/java/com/piaoniu/open/api/enums/IdCardType.java @@ -0,0 +1,21 @@ +package com.piaoniu.open.api.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 证件类型枚举 + */ +@AllArgsConstructor +@Getter +public enum IdCardType { + ID_CARD(1, "身份证"), + PASS_PORT(2, "护照"), + HONGKONG_PASS(3, "港澳居民来往内地通行证"), + TAIWAN_PASS(4, "台湾居民来往大陆通行证"), + HMT_RESIDENCE_PERMIT(5, "港澳台居民居住证"), + FOREIGNERS_PERMANENT_RESIDENCE_PERMIT(6, "外国人永久居留身份证"); + + private Integer value; + private String desc; +} -- Gitee From 089e8e150c99b3c5581df501a654b158ad568e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=A4=A9=E9=B9=8F?= Date: Wed, 17 Jan 2024 10:17:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/piaoniu/open/api/domain/activity/dto/ActivityDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityDTO.java b/src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityDTO.java index e957b00..0ed5550 100644 --- a/src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityDTO.java +++ b/src/main/java/com/piaoniu/open/api/domain/activity/dto/ActivityDTO.java @@ -47,7 +47,7 @@ public class ActivityDTO { private int weight; /** - * 演出层面上的限购信息, 详情接口返回 + * 演出层面上的限购信息 */ private OrderNumlimitDTO orderNumLimit; -- Gitee