From 5752cc4e3febd4437edce3f9d4dedfc13107685b Mon Sep 17 00:00:00 2001 From: MAO_LEE Date: Thu, 9 Nov 2023 13:12:02 +0000 Subject: [PATCH 1/3] =?UTF-8?q?:bug:=E3=80=90=E5=BE=AE=E4=BF=A1=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E3=80=91=E4=BA=8C=E7=BA=A7=E5=95=86=E6=88=B7=E8=BF=9B?= =?UTF-8?q?=E4=BB=B6=E7=94=B3=E8=AF=B7=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=87=8C=E7=9A=84=E9=87=91=E8=9E=8D=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E8=AE=B8=E5=8F=AF=E8=AF=81=E5=9B=BE=E7=89=87=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=AD=A3=E7=A1=AE=E7=9A=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../binarywang/wxpay/bean/ecommerce/ApplymentsRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsRequest.java index 9b0c6b660..80a32a6e4 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsRequest.java @@ -499,7 +499,7 @@ public class ApplymentsRequest implements Serializable { * */ @SerializedName(value = "finance_license_pics") - private String financeLicensePics; + private List financeLicensePics; } -- Gitee From 2f759e107f4b074d6119fd3c97b1ccec084e3ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8D=E9=B9=BF?= Date: Fri, 10 Nov 2023 18:26:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= 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 | 24 ++++++++++ .../channel/bean/order/OrderProductInfo.java | 17 +++++++ .../bean/order/OrderSkuDeliverInfo.java | 24 ++++++++++ .../channel/bean/order/OrderSkuShareInfo.java | 44 +++++++++++++++++++ 6 files changed, 121 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..35d61162d --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderProductExtraService.java @@ -0,0 +1,24 @@ +package me.chanjar.weixin.channel.bean.order; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.io.Serializable; + +/** + * 商品额外服务信息 + * + * @author 北鹤M + */ +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..6894ecf03 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderSkuDeliverInfo.java @@ -0,0 +1,24 @@ +package me.chanjar.weixin.channel.bean.order; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.io.Serializable; + +/** + * 商品发货信息 + * + * @author 北鹤M + */ +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; + +} -- Gitee From 943ade9003622da6b51cc47970d238d4342c7707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8D=E9=B9=BF?= Date: Fri, 10 Nov 2023 19:01:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/channel/bean/order/OrderProductExtraService.java | 4 ++++ .../weixin/channel/bean/order/OrderSkuDeliverInfo.java | 4 ++++ 2 files changed, 8 insertions(+) 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 index 35d61162d..ff413a964 100644 --- 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 @@ -1,6 +1,8 @@ package me.chanjar.weixin.channel.bean.order; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -9,6 +11,8 @@ import java.io.Serializable; * * @author 北鹤M */ +@Data +@NoArgsConstructor public class OrderProductExtraService implements Serializable { private static final long serialVersionUID = -8752053507170277156L; 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 index 6894ecf03..6dd46c9a3 100644 --- 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 @@ -1,6 +1,8 @@ package me.chanjar.weixin.channel.bean.order; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -9,6 +11,8 @@ import java.io.Serializable; * * @author 北鹤M */ +@Data +@NoArgsConstructor public class OrderSkuDeliverInfo implements Serializable { private static final long serialVersionUID = 4075897806362929800L; -- Gitee