From 8268fc83e7a5ededb23af78c307c4fd3fcba34f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=BC=E7=A6=84=C2=B7saber=C2=B7=E6=BD=8D=E7=B4=8D?= =?UTF-8?q?=E6=96=AF?= Date: Thu, 23 Nov 2023 10:33:09 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20#3171=20=E3=80=90=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E3=80=91=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=88=86=E7=AD=BE=E7=BA=A6=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payscore/PartnerUserSignPlanDetail.java | 2 +- .../bean/payscore/PayScoreNotifyData.java | 2 +- .../payscore/PayScorePlanDetailRequest.java | 43 +++++++++++++++++++ .../payscore/PayScorePlanDetailResult.java | 25 +++++++++++ .../WxPartnerPayScoreSignPlanRequest.java | 2 +- .../WxPartnerPayScoreSignPlanResult.java | 2 +- 6 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScorePlanDetailRequest.java create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScorePlanDetailResult.java diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PartnerUserSignPlanDetail.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PartnerUserSignPlanDetail.java index d006f15a0..a17fb9d83 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PartnerUserSignPlanDetail.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PartnerUserSignPlanDetail.java @@ -66,7 +66,7 @@ public class PartnerUserSignPlanDetail implements Serializable { * 计划详情名称 */ @SerializedName("plan_detail_name") - private Integer planDetailName; + private String planDetailName; /** * 计划明细对应订单实际支付金额（单位分） diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScoreNotifyData.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScoreNotifyData.java index 18b697538..c16f397da 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScoreNotifyData.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScoreNotifyData.java @@ -36,7 +36,7 @@ public class PayScoreNotifyData implements Serializable { *

3、用户确认成功通知的类型为PAYSCORE.USER_CONFIRM

*

4、支付成功通知的类型为PAYSCORE.USER_PAID

*

5、取消签约成功通知类型为PAYSCORE.USER_CANCEL_SIGN_PLAN

- *

6、签约计划成功通知类型为PAYSCORE

+ *

6、签约计划成功通知类型为PAYSCORE.USER_SIGN_PLAN

*/ @SerializedName("event_type") private String eventType; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScorePlanDetailRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScorePlanDetailRequest.java new file mode 100644 index 000000000..2f639e766 --- /dev/null +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScorePlanDetailRequest.java @@ -0,0 +1,43 @@ +package com.github.binarywang.wxpay.bean.payscore; + +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author UltramanNoa + * @className PayScorePlanDetail + * @description 支付分计划明细列表 + * @createTime 2023/11/3 11:22 + **/ +@Data +@NoArgsConstructor +public class PayScorePlanDetailRequest implements Serializable { + + private static final long serialVersionUID = 999251141141181820L; + /** + * 计划明细原支付金额(单位分) + */ + @SerializedName("original_price") + private Integer originalPrice; + + /** + * 计划明细优惠说明 + */ + @SerializedName("plan_discount_description") + private String planDiscountDescription; + + /** + * 计划明细实际支付金额(单位分) + */ + @SerializedName("actual_price") + private Long actualPrice; + + /** + * 计划明细名称 + */ + @SerializedName("plan_detail_name") + private String planDetailName; +} diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScorePlanDetailResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScorePlanDetailResult.java new file mode 100644 index 000000000..c4b3d3c04 --- /dev/null +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScorePlanDetailResult.java @@ -0,0 +1,25 @@ +package com.github.binarywang.wxpay.bean.payscore; + +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author UltramanNoa + * @className PayScorePlanDetail + * @description 支付分计划明细列表 + * @createTime 2023/11/3 11:22 + **/ +@Data +@NoArgsConstructor +public class PayScorePlanDetailResult extends PayScorePlanDetailRequest implements Serializable { + + private static final long serialVersionUID = -2195861995542633650L; + /** + * 计划明细序号(返回参数) + */ + @SerializedName("plan_detail_no") + private Integer planDetailNo; +} diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPartnerPayScoreSignPlanRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPartnerPayScoreSignPlanRequest.java index 02733e299..145dc8d2f 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPartnerPayScoreSignPlanRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPartnerPayScoreSignPlanRequest.java @@ -82,7 +82,7 @@ public class WxPartnerPayScoreSignPlanRequest extends WxPayScoreRequest { * 支付分计划明细列表 */ @SerializedName("plan_detail_list") - private List planDetailList; + private List planDetailList; /** * 商户侧计划号 diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPartnerPayScoreSignPlanResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPartnerPayScoreSignPlanResult.java index b5bcd5150..294add7ba 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPartnerPayScoreSignPlanResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPartnerPayScoreSignPlanResult.java @@ -88,7 +88,7 @@ public class WxPartnerPayScoreSignPlanResult extends WxPayScoreResult { * 支付分计划明细列表 */ @SerializedName("plan_detail_list") - private List planDetailList; + private List planDetailList; /** * 终止方商户号