diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpMapConfigImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpMapConfigImpl.java index a9eb344f3..388f39b8f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpMapConfigImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpMapConfigImpl.java @@ -6,9 +6,9 @@ import me.chanjar.weixin.common.bean.WxAccessToken; import java.util.concurrent.ConcurrentHashMap; /** - * @Author: Brayden Wong - * @Date: 2021/1/16 - * @Description: 提供accesstoken保存在concurrenthashmap中的实现,支持高并发。仅限于单机部署。 + * @author Brayden Wong + * @date 2021/1/16 + * 提供accesstoken保存在concurrenthashmap中的实现,支持高并发。仅限于单机部署。 */ @Data public class WxMpMapConfigImpl extends WxMpDefaultConfigImpl { diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxMaOpenSubpackage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxMaOpenSubpackage.java index e74049a53..3f71c4285 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxMaOpenSubpackage.java +++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxMaOpenSubpackage.java @@ -4,8 +4,8 @@ import lombok.Builder; import lombok.Data; /** - * @author: momorans - * @create: 2019-03-12 + * @author momorans + * @create 2019-03-12 **/ @Data @Builder diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsStatusResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsStatusResult.java index bfd034dcb..243f4e686 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsStatusResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsStatusResult.java @@ -9,7 +9,6 @@ import java.util.List; /** * 二级商户进件 查询申请状态结果响应 - * */ @Data @NoArgsConstructor diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsRequest.java index 9cc0d4b33..3f285285a 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsRequest.java @@ -344,7 +344,7 @@ public class CombineTransactionsRequest implements Serializable { @Data @NoArgsConstructor - public static class SettleInfo implements Serializable{ + public static class SettleInfo implements Serializable { /** *
      * 字段名:是否指定分账
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsResult.java
index f8d13db88..1b929ed96 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsResult.java
@@ -99,7 +99,7 @@ public class CombineTransactionsResult implements Serializable {
 
   @Data
   @NoArgsConstructor
-  public static class SubOrders implements  Serializable {
+  public static class SubOrders implements Serializable {
     /**
      * 
      * 字段名:子单商户号
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FinishOrderRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FinishOrderRequest.java
index 1b09ba6ff..0ab6b526e 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FinishOrderRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FinishOrderRequest.java
@@ -10,8 +10,9 @@ import java.io.Serializable;
  * 
  *   文档地址:https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/profitsharing/chapter3_5.shtml
  * 
- * @author: f00lish - * @date: 2020/09/12 + * + * @author f00lish + * @date 2020/09/12 */ @Data @Builder diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBalanceResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBalanceResult.java index e53b480c3..af1d77ad7 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBalanceResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBalanceResult.java @@ -5,8 +5,8 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @author: f00lish - * @date: 2020/09/12 + * @author f00lish + * @date 2020/09/12 */ @Data @NoArgsConstructor diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBillRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBillRequest.java index 9ed6b20cf..c47a9a045 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBillRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBillRequest.java @@ -8,8 +8,8 @@ import java.io.Serializable; /** * 资金账单请求 * - * @author: f00lish - * @date: 2020/09/28 + * @author f00lish + * @date 2020/09/28 */ @Data @Builder diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBillResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBillResult.java index b4a3ea45f..54ab3a165 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBillResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/FundBillResult.java @@ -8,8 +8,8 @@ import java.io.Serializable; /** * 资金账单结果 * - * @author: f00lish - * @date: 2020/09/28 + * @author f00lish + * @date 2020/09/28 */ @Data @Builder diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsCloseRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsCloseRequest.java index a98d0c69e..0222e7145 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsCloseRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsCloseRequest.java @@ -8,8 +8,9 @@ import java.io.Serializable; /** * 关闭普通订单请求 - * @author: f00lish - * @date: 2020/12/09 + * + * @author f00lish + * @date 2020/12/09 */ @Data @NoArgsConstructor diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ProfitSharingRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ProfitSharingRequest.java index ab83cab03..1ae90c6b8 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ProfitSharingRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ProfitSharingRequest.java @@ -13,8 +13,9 @@ import java.util.List; *
  *   文档地址:https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/profitsharing/chapter3_1.shtml
  * 
- * @author: f00lish - * @date: 2020/09/12 + * + * @author f00lish + * @date 2020/09/12 */ @Data @NoArgsConstructor diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ProfitSharingResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ProfitSharingResult.java index 37ff86c25..09cc3e843 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ProfitSharingResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ProfitSharingResult.java @@ -9,8 +9,9 @@ import java.util.List; /** * 请求分账 结果响应 - * @author: f00lish - * @date: 2020/09/12 + * + * @author f00lish + * @date 2020/09/12 */ @Data @NoArgsConstructor diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsRequest.java index 68dfd3e00..3666b4319 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsRequest.java @@ -1,10 +1,5 @@ package com.github.binarywang.wxpay.bean.ecommerce; -/** - * @author: f00lish - * @date: 2020/09/17 - */ - import com.google.gson.annotations.SerializedName; import lombok.*; @@ -12,11 +7,12 @@ import java.io.Serializable; /** * 退款申请 - * *
+ * * 
  *  *   文档地址:https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/refunds/chapter3_1.shtml
  *  * 
- * @author: f00lish - * @date: 2020/09/14 + * + * @author f00lish + * @date 2020/09/14 */ @Data @Builder @@ -156,7 +152,6 @@ public class RefundsRequest implements Serializable { @NoArgsConstructor(access = AccessLevel.PRIVATE) @AllArgsConstructor(access = AccessLevel.PRIVATE) public static class Amount implements Serializable { - private static final long serialVersionUID = 7383027142329410399L; /** diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsResult.java index 52eef53bf..c83fdf4a5 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsResult.java @@ -1,8 +1,8 @@ package com.github.binarywang.wxpay.bean.ecommerce; /** - * @author: f00lish - * @date: 2020/09/17 + * @author f00lish + * @date 2020/09/17 */ import com.google.gson.annotations.SerializedName; @@ -14,11 +14,12 @@ import java.util.Date; /** * 退款结果 - * *
+ * * 
  *  *   文档地址:https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/refunds/chapter3_1.shtml
  *  * 
- * @author: f00lish - * @date: 2020/09/14 + * + * @author f00lish + * @date 2020/09/14 */ @Data @NoArgsConstructor diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersQueryRequest.java index 1b6aeee80..6eec6d8f2 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersQueryRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersQueryRequest.java @@ -7,17 +7,20 @@ import java.io.Serializable; /** * 查询分账回退结果请求 - * *
+ * * 
  *  *   文档地址:https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/profitsharing/chapter3_3.shtml
  *  * 
- * @author: wangrui - * @date: 2021/02/20 + * + * @author wangrui + * @date 2021/02/20 */ @Data @Builder @NoArgsConstructor(access = AccessLevel.PRIVATE) @AllArgsConstructor(access = AccessLevel.PRIVATE) public class ReturnOrdersQueryRequest implements Serializable { + private static final long serialVersionUID = 4250796057341297359L; + /** *
    * 字段名:二级商户号
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersRequest.java
index 957b1a8d6..6c0197b72 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersRequest.java
@@ -7,11 +7,12 @@ import java.io.Serializable;
 
 /**
  * 请求分账回退
- *  * 
+ * * 
  *  *   文档地址:https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/profitsharing/chapter3_3.shtml
  *  * 
- * @author: f00lish - * @date: 2020/09/14 + * + * @author f00lish + * @date 2020/09/14 */ @Data @Builder diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersResult.java index f2110cc5d..5655139d0 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersResult.java @@ -8,8 +8,8 @@ import java.util.Date; /** - * @author: f00lish - * @date: 2020/09/14 + * @author f00lish + * @date 2020/09/14 */ @Data @Builder diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SpWithdrawStatusResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SpWithdrawStatusResult.java index d4c02443a..1165722bf 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SpWithdrawStatusResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SpWithdrawStatusResult.java @@ -11,8 +11,9 @@ import java.io.Serializable; *
  *   文档地址:https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/fund/chapter3_6.shtml
  * 
- * @author: f00lish - * @date: 2020/10/27 + * + * @author f00lish + * @date 2020/10/27 */ @Data @NoArgsConstructor diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SubWithdrawStatusResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SubWithdrawStatusResult.java index 27d624872..d76d4a512 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SubWithdrawStatusResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SubWithdrawStatusResult.java @@ -11,8 +11,9 @@ import java.io.Serializable; *
  *   文档地址:https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/fund/chapter3_3.shtml
  * 
- * @author: f00lish - * @date: 2020/10/27 + * + * @author f00lish + * @date 2020/10/27 */ @Data @NoArgsConstructor diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TradeBillResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TradeBillResult.java index 0a19894ed..477c83aa3 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TradeBillResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TradeBillResult.java @@ -8,8 +8,8 @@ import java.io.Serializable; /** * 交易账单结果 * - * @author: f00lish - * @date: 2020/09/28 + * @author f00lish + * @date 2020/09/28 */ @Data @Builder diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java index 12a22ead7..6bb04f9a6 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java @@ -69,7 +69,7 @@ public class TransactionsResult implements Serializable { private String signType; private String paySign; - private String getSignStr(){ + private String getSignStr() { return String.format("%s\n%s\n%s\n%s\n", appId, timeStamp, nonceStr, packageValue); } } @@ -86,10 +86,10 @@ public class TransactionsResult implements Serializable { } - public T getPayInfo(TradeTypeEnum tradeType, String appId, String mchId, PrivateKey privateKey){ + public T getPayInfo(TradeTypeEnum tradeType, String appId, String mchId, PrivateKey privateKey) { String timestamp = String.valueOf(System.currentTimeMillis() / 1000); String nonceStr = SignUtils.genRandomStr(); - switch (tradeType){ + switch (tradeType) { case JSAPI: JsapiResult jsapiResult = new JsapiResult(); jsapiResult.setAppId(appId).setTimeStamp(timestamp) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/FundBillTypeEnum.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/FundBillTypeEnum.java index 72aff3a02..a5058e2ba 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/FundBillTypeEnum.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/FundBillTypeEnum.java @@ -5,8 +5,9 @@ import lombok.Getter; /** * 账单类型 - * @author: f00lish - * @date: 2020/09/28 + * + * @author f00lish + * @date 2020/09/28 */ @Getter @AllArgsConstructor diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/SpAccountTypeEnum.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/SpAccountTypeEnum.java index 2d7067804..aa53db6c3 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/SpAccountTypeEnum.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/SpAccountTypeEnum.java @@ -5,8 +5,9 @@ import lombok.Getter; /** * 服务商账户类型 - * @author: f00lish - * @date: 2020/09/12 + * + * @author f00lish + * @date 2020/09/12 */ @Getter @AllArgsConstructor diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entwxpay/EntWxEmpPayRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entwxpay/EntWxEmpPayRequest.java index 37c0d038d..193c5293f 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entwxpay/EntWxEmpPayRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entwxpay/EntWxEmpPayRequest.java @@ -20,6 +20,7 @@ import java.util.Map; @AllArgsConstructor @XStreamAlias("xml") public class EntWxEmpPayRequest extends BaseWxPayRequest { + private static final long serialVersionUID = -3677217123742740648L; /** *