🎨 优化规范统一部分代码格式

2025-12-20 23:58:05 +08:00 · 2020-08-22 22:17:52 +08:00
parent aca8dbabbc
commit 817b474dd0
12 changed files with 1021 additions and 1011 deletions
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/applyment/ModifySettlementRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/applyment/ModifySettlementRequest.java
@@ -1,13 +1,13 @@
 package com.github.binarywang.wxpay.bean.applyment;

 import com.github.binarywang.wxpay.bean.applyment.enums.AccountTypeEnum;
+import com.github.binarywang.wxpay.v3.SpecEncrypt;
 import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import com.github.binarywang.wxpay.v3.SpecEncrypt;

 import java.io.Serializable;

--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/applyment/SettlementInfoResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/applyment/SettlementInfoResult.java
@@ -46,6 +46,7 @@ public class SettlementInfoResult implements Serializable {
  private String accountNumber;
  /**
   * 汇款验证结果
+   *
   * @see com.github.binarywang.wxpay.bean.applyment.enums.SettlementVerifyResultEnum
   */
  @SerializedName("verify_result")
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/applyment/WxPayApplyment4SubCreateRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/applyment/WxPayApplyment4SubCreateRequest.java
@@ -1,13 +1,13 @@
 package com.github.binarywang.wxpay.bean.applyment;

 import com.github.binarywang.wxpay.bean.applyment.enums.*;
+import com.github.binarywang.wxpay.v3.SpecEncrypt;
 import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import com.github.binarywang.wxpay.v3.SpecEncrypt;

 import java.io.Serializable;
 import java.util.List;
@@ -183,7 +183,8 @@ public class WxPayApplyment4SubCreateRequest implements Serializable {
    @NoArgsConstructor
    @AllArgsConstructor
    @Accessors(chain = true)
-        public static class BusinessLicenseInfo {
+    public static class BusinessLicenseInfo implements Serializable {
+      private static final long serialVersionUID = -1016615300418945838L;
      /**
       * 营业执照照片
       */
@@ -211,7 +212,8 @@ public class WxPayApplyment4SubCreateRequest implements Serializable {
    @NoArgsConstructor
    @AllArgsConstructor
    @Accessors(chain = true)
-        public static class CertificateInfo {
+    public static class CertificateInfo implements Serializable {
+      private static final long serialVersionUID = 5080675335337916895L;

      /**
       * 登记证书照片
@@ -274,7 +276,8 @@ public class WxPayApplyment4SubCreateRequest implements Serializable {
    @NoArgsConstructor
    @AllArgsConstructor
    @Accessors(chain = true)
-        public static class OrganizationInfo {
+    public static class OrganizationInfo implements Serializable {
+      private static final long serialVersionUID = 6497045652770046337L;
      /**
       * 组织机构代码证照片
       */
@@ -303,7 +306,8 @@ public class WxPayApplyment4SubCreateRequest implements Serializable {
    @NoArgsConstructor
    @AllArgsConstructor
    @Accessors(chain = true)
-        public static class IdentityInfo {
+    public static class IdentityInfo implements Serializable {
+      private static final long serialVersionUID = 1683704338370383827L;

      /**
       * 证件类型
@@ -336,7 +340,8 @@ public class WxPayApplyment4SubCreateRequest implements Serializable {
      @NoArgsConstructor
      @AllArgsConstructor
      @Accessors(chain = true)
-            public static class IdCardInfo {
+      public static class IdCardInfo implements Serializable {
+        private static final long serialVersionUID = -2897792705297641786L;
        /**
         * 身份证人像面照片
         */
@@ -378,7 +383,8 @@ public class WxPayApplyment4SubCreateRequest implements Serializable {
      @NoArgsConstructor
      @AllArgsConstructor
      @Accessors(chain = true)
-            public static class IdDocInfo {
+      public static class IdDocInfo implements Serializable {
+        private static final long serialVersionUID = 7335589815924447719L;
        /**
         * 证件照片
         */
@@ -416,7 +422,8 @@ public class WxPayApplyment4SubCreateRequest implements Serializable {
    @NoArgsConstructor
    @AllArgsConstructor
    @Accessors(chain = true)
-        public static class UboInfo {
+    public static class UboInfo implements Serializable {
+      private static final long serialVersionUID = 7918585690831975042L;
      /**
       * 证件类型
       */
@@ -497,8 +504,8 @@ public class WxPayApplyment4SubCreateRequest implements Serializable {
    @NoArgsConstructor
    @AllArgsConstructor
    @Accessors(chain = true)
-        public static class SalesInfo {
-
+    public static class SalesInfo implements Serializable {
+      private static final long serialVersionUID = 6428044729204137659L;
      /**
       * 经营场景类型
       */
@@ -549,8 +556,8 @@ public class WxPayApplyment4SubCreateRequest implements Serializable {
      @NoArgsConstructor
      @AllArgsConstructor
      @Accessors(chain = true)
-            public static class BizStoreInfo {
-
+      public static class BizStoreInfo implements Serializable {
+        private static final long serialVersionUID = 4397253725912709093L;
        /**
         * 门店名称
         */
@@ -597,8 +604,8 @@ public class WxPayApplyment4SubCreateRequest implements Serializable {
      @NoArgsConstructor
      @AllArgsConstructor
      @Accessors(chain = true)
-            public static class MpInfo {
-
+      public static class MpInfo implements Serializable {
+        private static final long serialVersionUID = 167582552189873597L;
        /**
         * 服务商公众号APPID
         */
@@ -627,8 +634,8 @@ public class WxPayApplyment4SubCreateRequest implements Serializable {
      @NoArgsConstructor
      @AllArgsConstructor
      @Accessors(chain = true)
-            public static class MiniProgramInfo {
-
+      public static class MiniProgramInfo implements Serializable {
+        private static final long serialVersionUID = -371749335686796436L;
        /**
         * 服务商小程序APPID
         */
@@ -658,8 +665,8 @@ public class WxPayApplyment4SubCreateRequest implements Serializable {
      @NoArgsConstructor
      @AllArgsConstructor
      @Accessors(chain = true)
-            public static class AppInfo {
-
+      public static class AppInfo implements Serializable {
+        private static final long serialVersionUID = 3959643687528770473L;
        /**
         * 服务商应用APPID
         */
@@ -688,8 +695,8 @@ public class WxPayApplyment4SubCreateRequest implements Serializable {
      @NoArgsConstructor
      @AllArgsConstructor
      @Accessors(chain = true)
-            public static class WebInfo {
-
+      public static class WebInfo implements Serializable {
+        private static final long serialVersionUID = -4183874827185822310L;
        /**
         * 互联网网站域名
         */
@@ -718,8 +725,8 @@ public class WxPayApplyment4SubCreateRequest implements Serializable {
      @NoArgsConstructor
      @AllArgsConstructor
      @Accessors(chain = true)
-            public static class WeworkInfo {
-
+      public static class WeworkInfo implements Serializable {
+        private static final long serialVersionUID = 9075531305717309383L;
        /**
         * 商家企业微信CorpID
         */
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/applyment/enums/SubjectTypeEnum.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/applyment/enums/SubjectTypeEnum.java
@@ -5,6 +5,7 @@ package com.github.binarywang.wxpay.bean.applyment.enums;
 * <pre>
 *     商户申请接入时如何选择主体类型？ https://kf.qq.com/faq/180910IBZVnQ180910naQ77b.html
 * </pre>
+ *
 * @author zhouyongshen
 */
 public enum SubjectTypeEnum {
@@ -23,6 +24,7 @@ public enum SubjectTypeEnum {
  /**
   * （其他组织）：不属于企业、政府/事业单位的组织机构（如社会团体、民办非企业、基金会），要求机构已办理组织机构代码证。
   */
-    SUBJECT_TYPE_OTHERS,;
+  SUBJECT_TYPE_OTHERS,
+  ;

 }