Skip to content

修改微信支付分-签约计划部分字段类型 #3171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Nov 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public class PartnerUserSignPlanDetail implements Serializable {
* 计划详情名称
*/
@SerializedName("plan_detail_name")
private Integer planDetailName;
private String planDetailName;

/**
* 计划明细对应订单实际支付金额(单位分)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class PayScoreNotifyData implements Serializable {
* <p>3、用户确认成功通知的类型为PAYSCORE.USER_CONFIRM</p>
* <p>4、支付成功通知的类型为PAYSCORE.USER_PAID</p>
* <p>5、取消签约成功通知类型为PAYSCORE.USER_CANCEL_SIGN_PLAN</p>
* <p>6、签约计划成功通知类型为PAYSCORE</p>
* <p>6、签约计划成功通知类型为PAYSCORE.USER_SIGN_PLAN</p>
*/
@SerializedName("event_type")
private String eventType;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
Original file line number Diff line number Diff line change
@@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public String toJson() {
* 支付分计划明细列表
*/
@SerializedName("plan_detail_list")
private List<PayScorePlanDetail> planDetailList;
private List<PayScorePlanDetailRequest> planDetailList;

/**
* 商户侧计划号
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public static WxPartnerPayScoreSignPlanResult fromJson(String json) {
* 支付分计划明细列表
*/
@SerializedName("plan_detail_list")
private List<PayScorePlanDetail> planDetailList;
private List<PayScorePlanDetailResult> planDetailList;

/**
* 终止方商户号
Expand Down