From bd69fcf596a5b69a451a3b7524b36329224c9613 Mon Sep 17 00:00:00 2001 From: xiafang Date: Tue, 15 Dec 2020 10:35:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0QA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/stackoverflow.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/stackoverflow.md b/docs/stackoverflow.md index 065c0d4..61a3f6c 100644 --- a/docs/stackoverflow.md +++ b/docs/stackoverflow.md @@ -7,6 +7,19 @@ - 代金券制券后不能修改，所以一定要注意 - 代金券激活券和制券要有一定的间隔时间，官方说是1分钟 - 发券不需要靠微信服务号，官方的描述是错误的，有一个支持微信登录的appid就行了 +- 制券 返回`403`，报文`{"code":"REQUEST_BLOCKED","message":"活动未开始或已结束\n"}`检查规则是否符合： + ``` + 1.stock_name：最多可填写9个字 + 2.max_coupons_per_user：单天发放个数上限不能为0 + 3. coupon_amount：10<=coupon_amount<=100000 + 4.available_time_after_receive：可用时间：相对时间，按分钟设置，是否1min<=分钟范围<=1440min + 5.transaction_minimum校验规则： + a、使用门槛-券面额>=0.01（门槛要大于面额） + b、0.1元<=门槛<=100000 + 6.stock_type：目前只支持NORMAL + 7.out_request_no：校验规则：不可以重复 + 8.活动时间不可以大于90天 + ``` - 不要过分相信微信文档，微信文档不一定是真的，要问就问他们客服 ## 支付宝 From 18c2b87a47e7ce65893c2f1a3f7e7a611b294ef2 Mon Sep 17 00:00:00 2001 From: xiafang Date: Tue, 15 Dec 2020 10:56:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0QA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/stackoverflow.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/stackoverflow.md b/docs/stackoverflow.md index 61a3f6c..33efafd 100644 --- a/docs/stackoverflow.md +++ b/docs/stackoverflow.md @@ -5,6 +5,7 @@ - [Java中的微信支付（3）：API V3对微信服务器响应进行签名验证](https://mp.weixin.qq.com/s/cb2eTTRjHifNYUGpQETMCQ) ### 微信支付V3中的坑 - 代金券制券后不能修改，所以一定要注意 +- 已激活的代金券批次被停用后不影响该批次已发放代金券的核销 - 代金券激活券和制券要有一定的间隔时间，官方说是1分钟 - 发券不需要靠微信服务号，官方的描述是错误的，有一个支持微信登录的appid就行了 - 制券 返回`403`，报文`{"code":"REQUEST_BLOCKED","message":"活动未开始或已结束\n"}`检查规则是否符合： @@ -19,8 +20,16 @@ 6.stock_type：目前只支持NORMAL 7.out_request_no：校验规则：不可以重复 8.活动时间不可以大于90天 - ``` -- 不要过分相信微信文档，微信文档不一定是真的，要问就问他们客服 + ``` +- 微信支付分`service_id`相关 +``` + 1. 在微信支付分功能申请成功后，联系运营那边配置 service_id。 + 2. service_id 是微信支付商户属性 + 3. 一个 service_id 可以对应多个 mchid + 4. 更多的就要联系微信支付BD了 +``` + +!> 不要过分相信微信文档，微信文档不一定是真的，要问就问他们客服 ## 支付宝 From 51e8e6f4f501bcaf38c72aa36e1b5a1019d0f5fb Mon Sep 17 00:00:00 2001 From: dax Date: Fri, 18 Dec 2020 18:17:53 +0800 Subject: [PATCH 3/4] qqun --- README.md | 4 ++++ docs/_coverpage.md | 1 + docs/img/qqun.png | Bin 0 -> 18353 bytes 3 files changed, 5 insertions(+) create mode 100644 docs/img/qqun.png diff --git a/README.md b/README.md index 533988b..9d84855 100644 --- a/README.md +++ b/README.md @@ -30,3 +30,7 @@ - [payment-spring-boot GitHub文档](https://notfound403.github.io/payment-spring-boot) - [payment-spring-boot Gitee文档](https://felord.gitee.io/payment-spring-boot) +## QQ交流群 +为了交流解惑，新建QQ群，可通过扫码进入。 + +![QQ交流群](./docs/img/qqun.png) \ No newline at end of file diff --git a/docs/_coverpage.md b/docs/_coverpage.md index d2fb743..f4bdff0 100644 --- a/docs/_coverpage.md +++ b/docs/_coverpage.md @@ -7,6 +7,7 @@ - Spring Boot Starter 风格 - 配置简单、只依赖 Spring 框架 +![QQ交流群](./img/qqun.png) [GitHub](https://github.com/NotFound403/payment-spring-boot) [示例项目](https://github.com/NotFound403/payment-spring-boot-samples) diff --git a/docs/img/qqun.png b/docs/img/qqun.png new file mode 100644 index 0000000000000000000000000000000000000000..90b1f49fad3ab783c4af981b5f2b47c0642a9d8a GIT binary patch literal 18353 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 Ea`z_z2_Xh96XoJ6WDkagcDf=aFcoTB~qk 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 F69Cy4T9E(% literal 0 HcmV?d00001 From 5101cb701e132c7af8579f551cf0375b27ab445f Mon Sep 17 00:00:00 2001 From: dax Date: Fri, 18 Dec 2020 18:47:44 +0800 Subject: [PATCH 4/4] copyrights --- .../java/cn/felord/payment/PayException.java | 19 ++- .../payment/alipay/AliPayConfiguration.java | 19 ++- .../payment/alipay/AliPayProperties.java | 28 ++++- .../autoconfigure/EnableMobilePay.java | 19 ++- .../autoconfigure/PayConfiguration.java | 19 ++- .../wechat/WechatPayConfiguration.java | 20 +++- .../payment/wechat/WechatPayProperties.java | 20 +++- .../wechat/WechatPayResponseErrorHandler.java | 21 +++- .../payment/wechat/enumeration/BankCode.java | 110 ++++++++++-------- .../wechat/enumeration/CouponBgColor.java | 18 +++ .../wechat/enumeration/CouponStatus.java | 20 +++- .../wechat/enumeration/StockStatus.java | 18 +++ .../wechat/enumeration/TradeState.java | 18 +++ .../payment/wechat/enumeration/TradeType.java | 18 +++ .../wechat/enumeration/WeChatServer.java | 18 +++ .../wechat/enumeration/WechatPayV3Type.java | 18 +++ .../felord/payment/wechat/v3/AbstractApi.java | 18 +++ .../v3/ExtensionFormHttpMessageConverter.java | 18 +++ .../payment/wechat/v3/KeyPairFactory.java | 20 +++- .../payment/wechat/v3/SignatureProvider.java | 26 ++++- .../payment/wechat/v3/WechatApiProvider.java | 18 +++ .../wechat/v3/WechatCombinePayApi.java | 26 ++++- .../payment/wechat/v3/WechatDirectPayApi.java | 20 +++- .../wechat/v3/WechatMarketingFavorApi.java | 23 +++- .../payment/wechat/v3/WechatMetaBean.java | 18 +++ .../wechat/v3/WechatMetaContainer.java | 18 +++ .../payment/wechat/v3/WechatPayCallback.java | 18 +++ .../payment/wechat/v3/WechatPayClient.java | 18 +++ .../wechat/v3/WechatRequestEntity.java | 19 ++- .../wechat/v3/WechatResponseEntity.java | 18 +++ .../payment/wechat/v3/model/Amount.java | 20 +++- .../wechat/v3/model/CallbackParams.java | 18 +++ .../model/CombineTransactionConsumeData.java | 20 +++- .../wechat/v3/model/ConsumeInformation.java | 30 +++++ .../wechat/v3/model/CouponAvailableTime.java | 19 +++ .../wechat/v3/model/CouponConsumeData.java | 66 +++++++++++ .../v3/model/CouponDetailsQueryParams.java | 18 +++ .../wechat/v3/model/CouponUseRule.java | 39 +++++++ .../payment/wechat/v3/model/Detail.java | 19 +++ .../payment/wechat/v3/model/DiscountTo.java | 24 ++++ .../wechat/v3/model/FixAvailableTime.java | 18 +++ .../wechat/v3/model/FixedNormalCoupon.java | 20 +++- .../felord/payment/wechat/v3/model/Goods.java | 19 ++- .../payment/wechat/v3/model/GoodsDetail.java | 30 +++++ .../payment/wechat/v3/model/H5Info.java | 19 +++ .../wechat/v3/model/MchQueryParams.java | 22 +++- .../v3/model/NormalCouponInformation.java | 24 ++++ .../payment/wechat/v3/model/PatternInfo.java | 19 ++- .../payment/wechat/v3/model/PayParams.java | 24 ++++ .../felord/payment/wechat/v3/model/Payer.java | 19 +++ .../wechat/v3/model/PromotionDetail.java | 19 +++ .../v3/model/ResponseSignVerifyParams.java | 18 +++ .../payment/wechat/v3/model/SceneInfo.java | 18 +++ .../payment/wechat/v3/model/SettleInfo.java | 19 ++- .../v3/model/SingleitemDiscountOff.java | 18 +++ .../payment/wechat/v3/model/StockUseRule.java | 18 +++ .../wechat/v3/model/StocksCreateParams.java | 18 +++ .../wechat/v3/model/StocksQueryParams.java | 20 +++- .../wechat/v3/model/StocksSendParams.java | 18 +++ .../payment/wechat/v3/model/StoreInfo.java | 19 ++- .../v3/model/TransactionConsumeData.java | 19 ++- .../v3/model/TransactionQueryParams.java | 23 +++- .../v3/model/UserCouponsQueryParams.java | 20 +++- .../v3/model/combine/CombineAmount.java | 18 +++ .../v3/model/combine/CombineCloseParams.java | 18 +++ .../v3/model/combine/CombineH5PayParams.java | 18 +++ .../v3/model/combine/CombineH5SceneInfo.java | 20 +++- .../v3/model/combine/CombinePayParams.java | 18 +++ .../v3/model/combine/CombinePayerInfo.java | 18 +++ .../v3/model/combine/CombineSceneInfo.java | 18 +++ .../wechat/v3/model/combine/SubOrder.java | 18 +++ 71 files changed, 1472 insertions(+), 89 deletions(-) diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/PayException.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/PayException.java index 8494e78..8d605ec 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/PayException.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/PayException.java @@ -1,7 +1,24 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment; /** - * * @author felord.cn * @since 1.0.0.RELEASE */ diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayConfiguration.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayConfiguration.java index ccdb21c..110f64c 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayConfiguration.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayConfiguration.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.alipay; @@ -20,7 +38,6 @@ import java.io.FileReader; import java.io.IOException; /** - * * @author felord.cn * @since 1.0.0.RELEASE */ diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayProperties.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayProperties.java index fa1c51b..f19b5de 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayProperties.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayProperties.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.alipay; import lombok.Data; @@ -27,7 +45,7 @@ public class AliPayProperties { * @since 1.0.0.RELEASE */ @Data - public static class V1{ + public static class V1 { /** * alipay server */ @@ -39,19 +57,19 @@ public class AliPayProperties { /** * your app private key, which must be in a single line */ - private String appPrivateKeyPath; + private String appPrivateKeyPath; /** * sign type default RSA2 */ private String signType = "RSA2"; /** - * data format only json now + * data format only json now */ - private String format ="json"; + private String format = "json"; /** * charset default utf-8 */ - private String charset ="utf-8"; + private String charset = "utf-8"; /** * alipay public cert path */ diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/EnableMobilePay.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/EnableMobilePay.java index ed04166..a9298a9 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/EnableMobilePay.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/EnableMobilePay.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.autoconfigure; import org.springframework.context.annotation.Import; @@ -5,7 +23,6 @@ import org.springframework.context.annotation.Import; import java.lang.annotation.*; /** - * * @author felord.cn * @since 1.0.0.RELEASE */ diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/PayConfiguration.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/PayConfiguration.java index ff71de2..90943b3 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/PayConfiguration.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/PayConfiguration.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.autoconfigure; import cn.felord.payment.alipay.AliPayConfiguration; @@ -6,7 +24,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; /** - * * @author felord.cn * @since 1.0.0.RELEASE */ diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java index 4c40fef..68d98eb 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat; @@ -78,7 +96,7 @@ public class WechatPayConfiguration { * @return the wechat api provider */ @Bean - public WechatApiProvider wechatApiProvider(WechatPayClient wechatPayClient){ + public WechatApiProvider wechatApiProvider(WechatPayClient wechatPayClient) { return new WechatApiProvider(wechatPayClient); } } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java index 6330feb..9c1022c 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat; import lombok.Data; @@ -18,7 +36,7 @@ public class WechatPayProperties { /** * wechat pay V3 properties */ - private Map v3 =new HashMap<>(); + private Map v3 = new HashMap<>(); /** * wechat pay v3 properties. diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayResponseErrorHandler.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayResponseErrorHandler.java index cf5c214..6290c5b 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayResponseErrorHandler.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayResponseErrorHandler.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat; import org.springframework.http.client.ClientHttpResponse; @@ -6,7 +24,6 @@ import org.springframework.web.client.DefaultResponseErrorHandler; import java.io.IOException; /** - * * @author felord.cn * @since 1.0.0.RELEASE */ @@ -14,6 +31,6 @@ public class WechatPayResponseErrorHandler extends DefaultResponseErrorHandler { @Override public boolean hasError(ClientHttpResponse response) throws IOException { - return false; + return false; } } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/BankCode.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/BankCode.java index 3ba272e..8db1407 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/BankCode.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/BankCode.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.enumeration; @@ -11,187 +29,187 @@ public enum BankCode { /** * 工商银行 */ - BK_1002("1002","工商银行"), + BK_1002("1002", "工商银行"), /** * 农业银行 */ - BK_1005("1005","农业银行"), + BK_1005("1005", "农业银行"), /** * 建设银行 */ - BK_1003("1003","建设银行"), + BK_1003("1003", "建设银行"), /** * 中国银行 */ - BK_1026("1026","中国银行"), + BK_1026("1026", "中国银行"), /** * 交通银行 */ - BK_1020("1020","交通银行"), + BK_1020("1020", "交通银行"), /** * 招商银行 */ - BK_1001("1001","招商银行"), + BK_1001("1001", "招商银行"), /** * 邮储银行 */ - BK_1066("1066","邮储银行"), + BK_1066("1066", "邮储银行"), /** * 民生银行 */ - BK_1006("1006","民生银行"), + BK_1006("1006", "民生银行"), /** * 平安银行 */ - BK_1010("1010","平安银行"), + BK_1010("1010", "平安银行"), /** * 中信银行 */ - BK_1021("1021","中信银行"), + BK_1021("1021", "中信银行"), /** * 浦发银行 */ - BK_1004("1004","浦发银行"), + BK_1004("1004", "浦发银行"), /** * 兴业银行 */ - BK_1009("1009","兴业银行"), + BK_1009("1009", "兴业银行"), /** * 光大银行 */ - BK_1022("1022","光大银行"), + BK_1022("1022", "光大银行"), /** * 广发银行 */ - BK_1027("1027","广发银行"), + BK_1027("1027", "广发银行"), /** * 华夏银行 */ - BK_1025("1025","华夏银行"), + BK_1025("1025", "华夏银行"), /** * 宁波银行 */ - BK_1056("1056","宁波银行"), + BK_1056("1056", "宁波银行"), /** * 北京银行 */ - BK_4836("4836","北京银行"), + BK_4836("4836", "北京银行"), /** * 上海银行 */ - BK_1024("1024","上海银行"), + BK_1024("1024", "上海银行"), /** * 南京银行 */ - BK_1054("1054","南京银行"), + BK_1054("1054", "南京银行"), /** * 长子县融汇村镇银行 */ - BK_4755("4755","长子县融汇村镇银行"), + BK_4755("4755", "长子县融汇村镇银行"), /** * 长沙银行 */ - BK_4216("4216","长沙银行"), + BK_4216("4216", "长沙银行"), /** * 浙江泰隆商业银行 */ - BK_4051("4051","浙江泰隆商业银行"), + BK_4051("4051", "浙江泰隆商业银行"), /** * 中原银行 */ - BK_4753("4753","中原银行"), + BK_4753("4753", "中原银行"), /** * 企业银行（中国） */ - BK_4761("4761","企业银行（中国）"), + BK_4761("4761", "企业银行（中国）"), /** * 顺德农商银行 */ - BK_4036("4036","顺德农商银行"), + BK_4036("4036", "顺德农商银行"), /** * 衡水银行 */ - BK_4752("4752","衡水银行"), + BK_4752("4752", "衡水银行"), /** * 长治银行 */ - BK_4756("4756","长治银行"), + BK_4756("4756", "长治银行"), /** * 大同银行 */ - BK_4767("4767","大同银行"), + BK_4767("4767", "大同银行"), /** * 河南省农村信用社 */ - BK_4115("4115","河南省农村信用社"), + BK_4115("4115", "河南省农村信用社"), /** * 宁夏黄河农村商业银行 */ - BK_4150("4150","宁夏黄河农村商业银行"), + BK_4150("4150", "宁夏黄河农村商业银行"), /** * 山西省农村信用社 */ - BK_4156("4156","山西省农村信用社"), + BK_4156("4156", "山西省农村信用社"), /** * 安徽省农村信用社 */ - BK_4166("4166","安徽省农村信用社"), + BK_4166("4166", "安徽省农村信用社"), /** * 甘肃省农村信用社 */ - BK_4157("4157","甘肃省农村信用社"), + BK_4157("4157", "甘肃省农村信用社"), /** * 天津农村商业银行 */ - BK_4153("4153","天津农村商业银行"), + BK_4153("4153", "天津农村商业银行"), /** * 广西壮族自治区农村信用社 */ - BK_4113("4113","广西壮族自治区农村信用社"), + BK_4113("4113", "广西壮族自治区农村信用社"), /** * 陕西省农村信用社 */ - BK_4108("4108","陕西省农村信用社"), + BK_4108("4108", "陕西省农村信用社"), /** * 深圳农村商业银行 */ - BK_4076("4076","深圳农村商业银行"), + BK_4076("4076", "深圳农村商业银行"), /** * 宁波鄞州农村商业银行 */ - BK_4052("4052","宁波鄞州农村商业银行"), + BK_4052("4052", "宁波鄞州农村商业银行"), /** * 浙江省农村信用社联合社 */ - BK_4764("4764","浙江省农村信用社联合社"), + BK_4764("4764", "浙江省农村信用社联合社"), /** * 江苏省农村信用社联合社 */ - BK_4217("4217","江苏省农村信用社联合社"), + BK_4217("4217", "江苏省农村信用社联合社"), /** * 江苏紫金农村商业银行股份有限公司 */ - BK_4072("4072","江苏紫金农村商业银行"), + BK_4072("4072", "江苏紫金农村商业银行"), /** * 北京中关村银行股份有限公司 */ - BK_4769("4769","北京中关村银行"), + BK_4769("4769", "北京中关村银行"), /** * 星展银行（中国）有限公司 */ - BK_4778("4778","星展银行（中国）"), + BK_4778("4778", "星展银行（中国）"), /** * 枣庄银行股份有限公司 */ - BK_4766("4766","枣庄银行"), + BK_4766("4766", "枣庄银行"), /** * 海口联合农村商业银行股份有限公司 */ - BK_4758("4758","海口联合农村商业银行"), + BK_4758("4758", "海口联合农村商业银行"), /** * 南洋商业银行（中国）有限公司 */ - BK_4763("4763","南洋商业银行（中国）"); + BK_4763("4763", "南洋商业银行（中国）"); private final String code; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponBgColor.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponBgColor.java index 3e35bf6..723022e 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponBgColor.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponBgColor.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.enumeration; /** diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponStatus.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponStatus.java index 8d5128f..3e67a2e 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponStatus.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponStatus.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.enumeration; /** @@ -6,7 +24,7 @@ package cn.felord.payment.wechat.enumeration; * @author felord.cn * @since 1.0.0.RELEASE */ -public enum CouponStatus { +public enum CouponStatus { /** * 可用. */ diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/StockStatus.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/StockStatus.java index dd0b84b..b3be4d0 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/StockStatus.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/StockStatus.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.enumeration; /** diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeState.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeState.java index b711489..26cba9e 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeState.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeState.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.enumeration; /** diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeType.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeType.java index 5d5de55..c82ce2c 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeType.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeType.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.enumeration; /** diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WeChatServer.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WeChatServer.java index 86b720c..7f1dc6c 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WeChatServer.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WeChatServer.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.enumeration; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java index 0bc9b0c..fb91430 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.enumeration; import org.springframework.http.HttpMethod; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java index e3b492e..2964e3d 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3; import cn.felord.payment.PayException; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/ExtensionFormHttpMessageConverter.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/ExtensionFormHttpMessageConverter.java index 3a982dd..930d435 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/ExtensionFormHttpMessageConverter.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/ExtensionFormHttpMessageConverter.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3; import org.springframework.http.*; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/KeyPairFactory.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/KeyPairFactory.java index 81fe80e..839245f 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/KeyPairFactory.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/KeyPairFactory.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3; @@ -43,7 +61,7 @@ public class KeyPairFactory { } } X509Certificate certificate = (X509Certificate) store.getCertificate(keyAlias); - certificate.checkValidity(); + certificate.checkValidity(); String serialNumber = certificate.getSerialNumber().toString(16).toUpperCase(); PublicKey publicKey = certificate.getPublicKey(); PrivateKey storeKey = (PrivateKey) store.getKey(keyAlias, pem); diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/SignatureProvider.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/SignatureProvider.java index a3e9980..10e9bff 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/SignatureProvider.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/SignatureProvider.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3; @@ -95,7 +113,7 @@ public class SignatureProvider { * @return the string */ @SneakyThrows - public String requestSign(String tenantId,String method, String canonicalUrl, String body) { + public String requestSign(String tenantId, String method, String canonicalUrl, String body) { Signature signer = Signature.getInstance("SHA256withRSA"); WechatMetaBean wechatMetaBean = wechatMetaContainer.getWechatMeta(tenantId); signer.initSign(wechatMetaBean.getKeyPair().getPrivate()); @@ -160,7 +178,7 @@ public class SignatureProvider { } // 签名 HttpMethod httpMethod = WechatPayV3Type.CERT.method(); - String authorization = requestSign(tenantId,httpMethod.name(), canonicalUrl, ""); + String authorization = requestSign(tenantId, httpMethod.name(), canonicalUrl, ""); HttpHeaders headers = new HttpHeaders(); headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON)); @@ -183,7 +201,7 @@ public class SignatureProvider { String associatedData = encryptCertificate.get("associated_data").asText(); String nonce = encryptCertificate.get("nonce").asText(); String ciphertext = encryptCertificate.get("ciphertext").asText(); - String publicKey = decryptResponseBody(tenantId,associatedData, nonce, ciphertext); + String publicKey = decryptResponseBody(tenantId, associatedData, nonce, ciphertext); ByteArrayInputStream inputStream = new ByteArrayInputStream(publicKey.getBytes(StandardCharsets.UTF_8)); Certificate certificate = null; @@ -210,7 +228,7 @@ public class SignatureProvider { * @param ciphertext the ciphertext * @return the string */ - public String decryptResponseBody(String tenantId,String associatedData, String nonce, String ciphertext) { + public String decryptResponseBody(String tenantId, String associatedData, String nonce, String ciphertext) { try { Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding"); String apiV3Key = wechatMetaContainer.getWechatMeta(tenantId).getV3().getAppV3Secret(); diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatApiProvider.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatApiProvider.java index 0a313c1..36478a1 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatApiProvider.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatApiProvider.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3; /** 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 86a6b7c..9c62786 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 @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3; import cn.felord.payment.wechat.WechatPayProperties; @@ -18,7 +36,7 @@ import java.net.URI; * @author felord.cn * @since 1.0.0.RELEASE */ -public class WechatCombinePayApi extends AbstractApi{ +public class WechatCombinePayApi extends AbstractApi { /** * Instantiates a new Abstract api. * @@ -156,7 +174,7 @@ public class WechatCombinePayApi extends AbstractApi{ * @param combineOutTradeNo the combine out trade no * @return the wechat response entity */ - public WechatResponseEntity queryTransactionByOutTradeNo(String combineOutTradeNo) { + public WechatResponseEntity queryTransactionByOutTradeNo(String combineOutTradeNo) { WechatResponseEntity wechatResponseEntity = new WechatResponseEntity<>(); this.client().withType(WechatPayV3Type.COMBINE_TRANSACTION_OUT_TRADE_NO, combineOutTradeNo) .function((wechatPayV3Type, outTradeNo) -> { @@ -175,7 +193,7 @@ public class WechatCombinePayApi extends AbstractApi{ * 合单关闭订单API. *

* 合单支付订单只能使用此合单关单api完成关单。 - * + *

* 微信服务器返回 204。 * * @param combineCloseParams the combine close params @@ -187,7 +205,7 @@ public class WechatCombinePayApi extends AbstractApi{ .function((wechatPayV3Type, params) -> { URI uri = UriComponentsBuilder.fromHttpUrl(wechatPayV3Type.uri(WeChatServer.CHINA)) .build().toUri(); - return Post(uri,params); + return Post(uri, params); }) .consumer(wechatResponseEntity::convert) .request(); diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatDirectPayApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatDirectPayApi.java index 9d7a526..101264c 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatDirectPayApi.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatDirectPayApi.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3; import cn.felord.payment.wechat.enumeration.WeChatServer; @@ -173,7 +191,7 @@ public class WechatDirectPayApi extends AbstractApi { .build() .expand(outTradeNo) .toUri(); - return Post(uri,queryParams); + return Post(uri, queryParams); } } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMarketingFavorApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMarketingFavorApi.java index bfa7cbe..ff4d4d5 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMarketingFavorApi.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMarketingFavorApi.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3; import cn.felord.payment.wechat.WechatPayProperties; @@ -220,6 +238,7 @@ public class WechatMarketingFavorApi extends AbstractApi { return wechatResponseEntity; } + /** * Query stocks function request entity. * @@ -374,7 +393,7 @@ public class WechatMarketingFavorApi extends AbstractApi { WechatPayProperties.V3 v3 = this.wechatMetaBean().getV3(); queryParams.add("stock_creator_mchid", v3.getMchId()); String stockId = params.getStockId(); - URI uri = UriComponentsBuilder.fromHttpUrl(type.uri(WeChatServer.CHINA)) + URI uri = UriComponentsBuilder.fromHttpUrl(type.uri(WeChatServer.CHINA)) .queryParams(queryParams) .build() .expand(stockId) @@ -552,7 +571,7 @@ public class WechatMarketingFavorApi extends AbstractApi { Map meta = new LinkedHashMap<>(2); String originalFilename = file.getOriginalFilename(); - String filename = StringUtils.hasText(originalFilename)? originalFilename :file.getName(); + String filename = StringUtils.hasText(originalFilename) ? originalFilename : file.getName(); meta.put("filename", filename); byte[] digest = SHA256.Digest.getInstance("SHA-256").digest(file.getBytes()); diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMetaBean.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMetaBean.java index 0f2178f..11dad68 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMetaBean.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMetaBean.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMetaContainer.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMetaContainer.java index 575ffaa..22f6b11 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMetaContainer.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatMetaContainer.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayCallback.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayCallback.java index f38b7e1..e5262aa 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayCallback.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayCallback.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3; import cn.felord.payment.PayException; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayClient.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayClient.java index 6b1b930..0693cb2 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayClient.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayClient.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatRequestEntity.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatRequestEntity.java index d0d6d81..cbc7322 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatRequestEntity.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatRequestEntity.java @@ -1,4 +1,21 @@ -package cn.felord.payment.wechat.v3; +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3; import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.Getter; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatResponseEntity.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatResponseEntity.java index b754a1b..c95a846 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatResponseEntity.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatResponseEntity.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Amount.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Amount.java index 2b540f3..621b14f 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Amount.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Amount.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; @@ -17,5 +35,5 @@ public class Amount { /** * The Currency. */ - private String currency ="CNY"; + private String currency = "CNY"; } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CallbackParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CallbackParams.java index db0b2c7..65ec281 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CallbackParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CallbackParams.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CombineTransactionConsumeData.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CombineTransactionConsumeData.java index 4da8137..52b89ce 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CombineTransactionConsumeData.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CombineTransactionConsumeData.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import cn.felord.payment.wechat.v3.model.combine.CombinePayerInfo; @@ -115,7 +133,7 @@ public class CombineTransactionConsumeData { * @since 1.0.0.RELEASE */ @Data - public static class CombineAmount{ + public static class CombineAmount { /** * 标价金额，单位为分. */ diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ConsumeInformation.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ConsumeInformation.java index 39bd287..240c8b0 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ConsumeInformation.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ConsumeInformation.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; @@ -14,12 +32,24 @@ import java.util.List; @Data public class ConsumeInformation { + /** + * The Consume mchid. + */ private String consumeMchid; + /** + * The Consume time. + */ private String consumeTime; + /** + * The Goods detail. + */ private List goodsDetail; + /** + * The Transaction id. + */ private String transactionId; } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponAvailableTime.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponAvailableTime.java index 28e5c86..9eccddc 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponAvailableTime.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponAvailableTime.java @@ -1,9 +1,28 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; /** + * The type Coupon available time. * * @author felord.cn * @since 1.0.0.RELEASE diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponConsumeData.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponConsumeData.java index dc39183..166dd24 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponConsumeData.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponConsumeData.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; @@ -13,21 +31,69 @@ import lombok.Data; public class CouponConsumeData { + /** + * The Available begin time. + */ private String availableBeginTime; + /** + * The Available end time. + */ private String availableEndTime; + /** + * The Consume information. + */ private ConsumeInformation consumeInformation; + /** + * The Coupon id. + */ private String couponId; + /** + * The Coupon name. + */ private String couponName; + /** + * The Coupon type. + */ private String couponType; + /** + * The Create time. + */ private String createTime; + /** + * The Description. + */ private String description; + /** + * The Discount to. + */ private DiscountTo discountTo; + /** + * The No cash. + */ private boolean noCash; + /** + * The Normal coupon information. + */ private NormalCouponInformation normalCouponInformation; + /** + * The Singleitem. + */ private boolean singleitem; + /** + * The Singleitem discount off. + */ private SingleitemDiscountOff singleitemDiscountOff; + /** + * The Status. + */ private String status; + /** + * The Stock creator mchid. + */ private String stockCreatorMchid; + /** + * The Stock id. + */ private String stockId; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponDetailsQueryParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponDetailsQueryParams.java index 1cf97d3..2e6f5ff 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponDetailsQueryParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponDetailsQueryParams.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponUseRule.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponUseRule.java index b430fc2..b884b14 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponUseRule.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponUseRule.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; @@ -15,17 +33,38 @@ import java.util.List; public class CouponUseRule { + /** + * The Available items. + */ private List availableItems; + /** + * The Available merchants. + */ private List availableMerchants; + /** + * The Combine use. + */ private Boolean combineUse; + /** + * The Coupon available time. + */ private CouponAvailableTime couponAvailableTime; + /** + * The Fixed normal coupon. + */ private FixedNormalCoupon fixedNormalCoupon; + /** + * The Goods tag. + */ private List goodsTag; + /** + * The Trade type. + */ private String tradeType; } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Detail.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Detail.java index 24d48ed..2c2381f 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Detail.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Detail.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; @@ -5,6 +23,7 @@ import lombok.Data; import java.util.List; /** + * The type Detail. * * @author felord.cn * @since 1.0.0.RELEASE diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/DiscountTo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/DiscountTo.java index 3f9a8f9..eb9833a 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/DiscountTo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/DiscountTo.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; @@ -12,7 +30,13 @@ import lombok.Data; @Data public class DiscountTo { + /** + * The Cut to price. + */ private Long cutToPrice; + /** + * The Max price. + */ private Long maxPrice; } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/FixAvailableTime.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/FixAvailableTime.java index 37046d7..6e2f48c 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/FixAvailableTime.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/FixAvailableTime.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/FixedNormalCoupon.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/FixedNormalCoupon.java index 9c87e8e..9d2de3a 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/FixedNormalCoupon.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/FixedNormalCoupon.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; @@ -6,7 +24,7 @@ import lombok.Data; /** * 固定面额满减券使用规则, stock_type为NORMAL时必填 - * + *

* 满transactionMinimum 减少 couponAmount * * @author felord.cn diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Goods.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Goods.java index 6786456..1fd46f9 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Goods.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Goods.java @@ -1,9 +1,26 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; /** - * * @author felord.cn * @since 1.0.0.RELEASE */ diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/GoodsDetail.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/GoodsDetail.java index 0b297ae..915a07f 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/GoodsDetail.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/GoodsDetail.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; @@ -12,9 +30,21 @@ import lombok.Data; @Data public class GoodsDetail { + /** + * The Discount amount. + */ private Long discountAmount; + /** + * The Goods id. + */ private String goodsId; + /** + * The Price. + */ private Long price; + /** + * The Quantity. + */ private Long quantity; } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/H5Info.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/H5Info.java index bc5d51b..ef47f41 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/H5Info.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/H5Info.java @@ -1,8 +1,27 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; /** + * H5 信息 * * @author felord.cn * @since 1.0.0.RELEASE diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/MchQueryParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/MchQueryParams.java index a053d3e..fb34284 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/MchQueryParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/MchQueryParams.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; @@ -12,13 +30,13 @@ import lombok.Data; public class MchQueryParams { /** * 必填 - * + *

* 查询代金券可用商户API 分页页码，最大1000。 */ private Integer offset = 0; /** * 必填 - * + *

* 查询代金券可用商户API 最大50。 */ private Integer limit = 10; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/NormalCouponInformation.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/NormalCouponInformation.java index f4c7d76..91c2733 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/NormalCouponInformation.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/NormalCouponInformation.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; @@ -12,7 +30,13 @@ import lombok.Data; @Data public class NormalCouponInformation { + /** + * The Coupon amount. + */ private Long couponAmount; + /** + * The Transaction minimum. + */ private Long transactionMinimum; } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PatternInfo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PatternInfo.java index 98317e3..e93c1e8 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PatternInfo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PatternInfo.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; @@ -7,7 +25,6 @@ import lombok.Data; /** * 优惠券样式 * - * * @author felord.cn * @since 1.0.0.RELEASE */ diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PayParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PayParams.java index 46ce664..25a7e21 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PayParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PayParams.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; @@ -11,7 +29,13 @@ import lombok.Data; */ @Data public class PayParams { + /** + * The Appid. + */ private String appid; + /** + * The Mchid. + */ private String mchid; /** * 商品描述 diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Payer.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Payer.java index b7feb74..5802b6e 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Payer.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Payer.java @@ -1,8 +1,27 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; /** + * The type Payer. * * @author felord.cn * @since 1.0.0.RELEASE diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PromotionDetail.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PromotionDetail.java index c3ca398..9a99de7 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PromotionDetail.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/PromotionDetail.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; @@ -11,6 +29,7 @@ import java.util.List; * @author felord.cn * @since 1.0.0.RELEASE */ +@Data public class PromotionDetail { /** diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ResponseSignVerifyParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ResponseSignVerifyParams.java index 9ef911d..74be136 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ResponseSignVerifyParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ResponseSignVerifyParams.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import cn.felord.payment.wechat.v3.SignatureProvider; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SceneInfo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SceneInfo.java index dbeee45..3cc6f5c 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SceneInfo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SceneInfo.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SettleInfo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SettleInfo.java index c2cb91f..88c7518 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SettleInfo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SettleInfo.java @@ -1,9 +1,26 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; /** - * * @author felord.cn * @since 1.0.0.RELEASE */ diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SingleitemDiscountOff.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SingleitemDiscountOff.java index 479a10d..eab5a97 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SingleitemDiscountOff.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/SingleitemDiscountOff.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StockUseRule.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StockUseRule.java index 9c8b189..42c1c07 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StockUseRule.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StockUseRule.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksCreateParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksCreateParams.java index da22ff5..109a8ce 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksCreateParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksCreateParams.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksQueryParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksQueryParams.java index b09d797..64b810f 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksQueryParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksQueryParams.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import cn.felord.payment.wechat.enumeration.StockStatus; @@ -35,7 +53,7 @@ public class StocksQueryParams { * 查询代金券可用单品API 最大100。 */ private Integer limit = 10; -/* *//** + /* *//** * 根据API而定 *

* 批次ID diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksSendParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksSendParams.java index 44fe887..f814c2c 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksSendParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StocksSendParams.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StoreInfo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StoreInfo.java index 1a1c304..83ef02a 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StoreInfo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/StoreInfo.java @@ -1,9 +1,26 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; /** - * * @author felord.cn * @since 1.0.0.RELEASE */ diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/TransactionConsumeData.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/TransactionConsumeData.java index 5e9b226..6a28024 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/TransactionConsumeData.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/TransactionConsumeData.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; @@ -6,7 +24,6 @@ import lombok.Data; import java.util.List; /** - * * @author felord.cn * @since 1.0.0.RELEASE */ diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/TransactionQueryParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/TransactionQueryParams.java index 1366b94..05096c1 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/TransactionQueryParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/TransactionQueryParams.java @@ -1,14 +1,31 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; /** - * * @author felord.cn * @since 1.0.0.RELEASE */ @Data public class TransactionQueryParams { -private String mchId; -private String transactionIdOrOutTradeNo; + private String mchId; + private String transactionIdOrOutTradeNo; } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/UserCouponsQueryParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/UserCouponsQueryParams.java index 4d321bf..b0f152e 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/UserCouponsQueryParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/UserCouponsQueryParams.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model; import lombok.Data; @@ -54,7 +72,7 @@ public class UserCouponsQueryParams { * @author felord.cn * @since 1.0.0.RELEASE */ - public enum Status{ + public enum Status { /** * Sended status. */ diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineAmount.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineAmount.java index ab9e9fe..8e3db35 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineAmount.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineAmount.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model.combine; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineCloseParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineCloseParams.java index ec57d31..1f41c56 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineCloseParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineCloseParams.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model.combine; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineH5PayParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineH5PayParams.java index 1b29817..1dd2788 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineH5PayParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineH5PayParams.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model.combine; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineH5SceneInfo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineH5SceneInfo.java index a97b294..50688d4 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineH5SceneInfo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineH5SceneInfo.java @@ -1,3 +1,21 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model.combine; import cn.felord.payment.wechat.v3.model.H5Info; @@ -7,5 +25,5 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data public class CombineH5SceneInfo extends CombineSceneInfo { - private H5Info h5Info; + private H5Info h5Info; } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombinePayParams.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombinePayParams.java index 0e23334..38ceb4c 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombinePayParams.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombinePayParams.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model.combine; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombinePayerInfo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombinePayerInfo.java index 90bee19..056d927 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombinePayerInfo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombinePayerInfo.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model.combine; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineSceneInfo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineSceneInfo.java index d32258f..b43dd77 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineSceneInfo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineSceneInfo.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model.combine; import lombok.Data; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/SubOrder.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/SubOrder.java index 786ba07..92b5ab2 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/SubOrder.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/SubOrder.java @@ -1,4 +1,22 @@ +/* + * + * Copyright 2019-2020 felord.cn + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * Website: + * https://felord.cn + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package cn.felord.payment.wechat.v3.model.combine; import cn.felord.payment.wechat.v3.model.SettleInfo;