diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatCombinePayApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatCombinePayApi.java index 5b219f0..86a6b7c 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatCombinePayApi.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatCombinePayApi.java @@ -183,7 +183,7 @@ public class WechatCombinePayApi extends AbstractApi{ */ public WechatResponseEntity close(CombineCloseParams combineCloseParams) { WechatResponseEntity wechatResponseEntity = new WechatResponseEntity<>(); - this.client().withType(WechatPayV3Type.COMBINE_NATIVE, combineCloseParams) + this.client().withType(WechatPayV3Type.COMBINE_CLOSE, combineCloseParams) .function((wechatPayV3Type, params) -> { URI uri = UriComponentsBuilder.fromHttpUrl(wechatPayV3Type.uri(WeChatServer.CHINA)) .build().toUri(); diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/A.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/A.java new file mode 100644 index 0000000..537dae7 --- /dev/null +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/A.java @@ -0,0 +1,25 @@ + +package cn.felord.payment.wechat.v3.model.payscore; + + +import lombok.Data; + +import java.util.List; + +@Data +public class A { + + private String appid; + private String attach; + private Location location; + private Boolean needUserConfirm; + private String notifyUrl; + private String openid; + private String outOrderNo; + private List postDiscounts; + private List postPayments; + private RiskFund riskFund; + private String serviceId; + private String serviceIntroduction; + private TimeRange timeRange; +} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/Location.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/Location.java new file mode 100644 index 0000000..a9c4e27 --- /dev/null +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/Location.java @@ -0,0 +1,10 @@ + +package cn.felord.payment.wechat.v3.model.payscore; + +import lombok.Data; + +@Data +public class Location { + private String endLocation; + private String startLocation; +} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/PostDiscount.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/PostDiscount.java new file mode 100644 index 0000000..1c53da7 --- /dev/null +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/PostDiscount.java @@ -0,0 +1,11 @@ + +package cn.felord.payment.wechat.v3.model.payscore; + +import lombok.Data; + +@Data +public class PostDiscount { + + private String description; + private String name; +} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/PostPayment.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/PostPayment.java new file mode 100644 index 0000000..08c56fb --- /dev/null +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/PostPayment.java @@ -0,0 +1,12 @@ + +package cn.felord.payment.wechat.v3.model.payscore; + + +public class PostPayment { + + private Long amount; + private Long count; + private String description; + private String name; + +} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/RiskFund.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/RiskFund.java new file mode 100644 index 0000000..d7c691e --- /dev/null +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/RiskFund.java @@ -0,0 +1,12 @@ + +package cn.felord.payment.wechat.v3.model.payscore; + +import lombok.Data; + +@Data +public class RiskFund { + + private Long amount; + private String description; + private String name; +} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/TimeRange.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/TimeRange.java new file mode 100644 index 0000000..13165ae --- /dev/null +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/TimeRange.java @@ -0,0 +1,10 @@ + +package cn.felord.payment.wechat.v3.model.payscore; + +import lombok.Data; + +@Data +public class TimeRange { + private String endTime; + private String startTime; +}