From 473d2c14c334e6d1c69887c560cce7b81d7b4b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E9=B9=A4?= Date: Mon, 13 Nov 2023 03:08:47 +0000 Subject: [PATCH] =?UTF-8?q?:art:=20=E3=80=90=E8=A7=86=E9=A2=91=E5=8F=B7?= =?UTF-8?q?=E3=80=91=E8=A7=86=E9=A2=91=E5=8F=B7=E5=B0=8F=E5=BA=97=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=20!113?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../channel/bean/order/OrderDetailInfo.java | 4 ++ .../channel/bean/order/OrderPriceInfo.java | 8 ++++ .../bean/order/OrderProductExtraService.java | 28 ++++++++++++ .../channel/bean/order/OrderProductInfo.java | 17 +++++++ .../bean/order/OrderSkuDeliverInfo.java | 28 ++++++++++++ .../channel/bean/order/OrderSkuShareInfo.java | 44 +++++++++++++++++++ 6 files changed, 129 insertions(+) create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderProductExtraService.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderSkuDeliverInfo.java create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderSkuShareInfo.java diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderDetailInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderDetailInfo.java index 1f4d55924..8a17140cc 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderDetailInfo.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderDetailInfo.java @@ -52,4 +52,8 @@ public class OrderDetailInfo implements Serializable { @JsonProperty("settle_info") private OrderSettleInfo settleInfo; + /** 分享员信息 */ + @JsonProperty("sku_sharer_infos") + private List skuSharerInfos; + } diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderPriceInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderPriceInfo.java index 89bef2dae..64e6690a6 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderPriceInfo.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderPriceInfo.java @@ -55,4 +55,12 @@ public class OrderPriceInfo implements Serializable { @JsonProperty("is_change_freight") private Boolean changeFreighted; + /** 是否使用了会员积分抵扣 */ + @JsonProperty("use_deduction") + private Boolean useDeduction; + + /** 会员积分抵扣金额,单位为分 */ + @JsonProperty("deduction_price") + private Integer deductionPrice; + } diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderProductExtraService.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderProductExtraService.java new file mode 100644 index 000000000..ff413a964 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderProductExtraService.java @@ -0,0 +1,28 @@ +package me.chanjar.weixin.channel.bean.order; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 商品额外服务信息 + * + * @author 北鹤M + */ +@Data +@NoArgsConstructor +public class OrderProductExtraService implements Serializable { + + private static final long serialVersionUID = -8752053507170277156L; + + /** 7天无理由:0:不支持,1:支持 */ + @JsonProperty("seven_day_return") + private Integer sevenDayReturn; + + /** 商家运费险:0:不支持,1:支持 */ + @JsonProperty("freight_insurance") + private Integer freightInsurance; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderProductInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderProductInfo.java index 3d5d7a92c..acef8cc4f 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderProductInfo.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderProductInfo.java @@ -92,4 +92,21 @@ public class OrderProductInfo implements Serializable { /** 区域库存id */ @JsonProperty("out_warehouse_id") private String outWarehouseId; + + /** 商品发货信息 */ + @JsonProperty("sku_deliver_info") + private OrderSkuDeliverInfo skuDeliverInfo; + + /** 商品额外服务信息 */ + @JsonProperty("extra_service") + private OrderProductExtraService extraService; + + /** 是否使用了会员积分抵扣 */ + @JsonProperty("use_deduction") + private Boolean useDeduction; + + /** 会员积分抵扣金额,单位为分 */ + @JsonProperty("deduction_price") + private Integer deductionPrice; + } diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderSkuDeliverInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderSkuDeliverInfo.java new file mode 100644 index 000000000..6dd46c9a3 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderSkuDeliverInfo.java @@ -0,0 +1,28 @@ +package me.chanjar.weixin.channel.bean.order; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 商品发货信息 + * + * @author 北鹤M + */ +@Data +@NoArgsConstructor +public class OrderSkuDeliverInfo implements Serializable { + + private static final long serialVersionUID = 4075897806362929800L; + + /** 商品发货类型:0:现货,1:全款预售 */ + @JsonProperty("stock_type") + private Integer stockType; + + /** 预计发货时间(stock_type=1时返回该字段) */ + @JsonProperty("predict_delivery_time") + private String predictDeliveryTime; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderSkuShareInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderSkuShareInfo.java new file mode 100644 index 000000000..7912e5334 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderSkuShareInfo.java @@ -0,0 +1,44 @@ +package me.chanjar.weixin.channel.bean.order; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * Sku层分享信息 + * + * @author 北鹤M + */ +@Data +@NoArgsConstructor +public class OrderSkuShareInfo implements Serializable { + + private static final long serialVersionUID = 705312408112124476L; + + /** 分享员openid */ + @JsonProperty("sharer_openid") + private String sharerOpenid; + + /** 分享员unionid */ + @JsonProperty("sharer_unionid") + private String sharerUnionid; + + /** 分享员类型,0:普通分享员,1:店铺分享员 */ + @JsonProperty("sharer_type") + private Integer sharerType; + + /** 分享场景 {@link me.chanjar.weixin.channel.enums.ShareScene} */ + @JsonProperty("share_scene") + private Integer shareScene; + + /** 商品skuid */ + @JsonProperty("sku_id") + private String skuId; + + /** 是否来自企微分享 */ + @JsonProperty("from_wecom") + private Boolean fromWecom; + +}