From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Sun, 14 Jul 2019 13:42:34 +0000 (+0800)
Subject: refactor: 重构类型enum定义
X-Git-Tag: 1.0.0^2~52
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=8ff10f6ed8f535e7088e2bd9a09aafdad9ad648f;p=epayment%2Ffood_payapi.git

refactor: 重构类型enum定义
---

diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/IDNoCheck.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/IDNoCheck.java
index 16061340..69f8007e 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/IDNoCheck.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/IDNoCheck.java
@@ -1,6 +1,6 @@
 package com.supwisdom.dlpay.api.annotation;
 
-import com.supwisdom.dlpay.api.util.IDTypes;
+import com.supwisdom.dlpay.api.types.IDTypes;
 import com.supwisdom.dlpay.api.validator.IDNoCheckValidator;
 
 import javax.validation.Constraint;
diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/Sex.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/Sex.java
index 44fb69e7..5d7699c0 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/Sex.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/Sex.java
@@ -1,8 +1,7 @@
 package com.supwisdom.dlpay.api.annotation;
 
-import com.supwisdom.dlpay.api.util.SexTypes;
+import com.supwisdom.dlpay.api.types.SexTypes;
 import com.supwisdom.dlpay.api.validator.SexValidator;
-import com.supwisdom.dlpay.api.validator.UserStatusValidator;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/ShopType.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/ShopType.java
index 4c16761b..bcbd9187 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/ShopType.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/annotation/ShopType.java
@@ -1,7 +1,6 @@
 package com.supwisdom.dlpay.api.annotation;
 
-import com.supwisdom.dlpay.api.util.SexTypes;
-import com.supwisdom.dlpay.api.util.ShopTypes;
+import com.supwisdom.dlpay.api.types.ShopTypes;
 import com.supwisdom.dlpay.api.validator.ShopTypeValidator;
 
 import javax.validation.Constraint;
diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/OpenShopParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/OpenShopParam.java
index df8ba1e4..9f02dd40 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/OpenShopParam.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/OpenShopParam.java
@@ -6,7 +6,7 @@ import com.supwisdom.dlpay.api.annotation.MobileNumber;
 import com.supwisdom.dlpay.api.annotation.Sign;
 import com.supwisdom.dlpay.api.exception.RequestParamCheckException;
 import com.supwisdom.dlpay.api.annotation.ShopType;
-import com.supwisdom.dlpay.api.util.IDTypes;
+import com.supwisdom.dlpay.api.types.IDTypes;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/OpenUserParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/OpenUserParam.java
index 09514e32..1cf44f71 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/OpenUserParam.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/OpenUserParam.java
@@ -7,7 +7,7 @@ import com.supwisdom.dlpay.api.annotation.Sex;
 import com.supwisdom.dlpay.api.annotation.Sign;
 import com.supwisdom.dlpay.api.exception.RequestParamCheckException;
 import com.supwisdom.dlpay.api.util.Constants;
-import com.supwisdom.dlpay.api.util.IDTypes;
+import com.supwisdom.dlpay.api.types.IDTypes;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/util/IDTypes.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/types/IDTypes.java
similarity index 93%
rename from payapi-common/src/main/java/com/supwisdom/dlpay/api/util/IDTypes.java
rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/types/IDTypes.java
index 79d4b629..92cc8d75 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/util/IDTypes.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/types/IDTypes.java
@@ -1,4 +1,4 @@
-package com.supwisdom.dlpay.api.util;
+package com.supwisdom.dlpay.api.types;
 
 public enum IDTypes {
   IDCARD(52, "idcard"), // 身份证
@@ -33,6 +33,7 @@ public enum IDTypes {
     return this.data;
   }
 
+
   private Object data;
 
   private int id;
@@ -56,4 +57,9 @@ public enum IDTypes {
     }
     return -999;
   }
+
+  @Override
+  public String toString() {
+    return value();
+  }
 }
diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/util/SexTypes.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/types/SexTypes.java
similarity index 75%
rename from payapi-common/src/main/java/com/supwisdom/dlpay/api/util/SexTypes.java
rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/types/SexTypes.java
index 380110fc..da8866f4 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/util/SexTypes.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/types/SexTypes.java
@@ -1,4 +1,4 @@
-package com.supwisdom.dlpay.api.util;
+package com.supwisdom.dlpay.api.types;
 
 public enum SexTypes {
   MALE("male"),
@@ -10,6 +10,7 @@ public enum SexTypes {
     this.data = data;
   }
 
+
   public String value() {
     return this.data.toString();
   }
@@ -19,4 +20,9 @@ public enum SexTypes {
   }
 
   private Object data;
+
+  @Override
+  public String toString() {
+    return value();
+  }
 }
diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/util/ShopTypes.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/types/ShopTypes.java
similarity index 89%
rename from payapi-common/src/main/java/com/supwisdom/dlpay/api/util/ShopTypes.java
rename to payapi-common/src/main/java/com/supwisdom/dlpay/api/types/ShopTypes.java
index 3503ab0b..32bb010d 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/util/ShopTypes.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/types/ShopTypes.java
@@ -1,4 +1,4 @@
-package com.supwisdom.dlpay.api.util;
+package com.supwisdom.dlpay.api.types;
 
 public enum ShopTypes {
   GROUP("group", "商户组"),
@@ -29,6 +29,6 @@ public enum ShopTypes {
 
   @Override
   public String toString() {
-    return this.id;
+    return value();
   }
 }
diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/IDNoCheckValidator.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/IDNoCheckValidator.java
index ea516886..18371389 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/IDNoCheckValidator.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/IDNoCheckValidator.java
@@ -1,7 +1,7 @@
 package com.supwisdom.dlpay.api.validator;
 
 import com.supwisdom.dlpay.api.annotation.IDNoCheck;
-import com.supwisdom.dlpay.api.util.IDTypes;
+import com.supwisdom.dlpay.api.types.IDTypes;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/SexValidator.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/SexValidator.java
index 22aba883..faa6f9bb 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/SexValidator.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/SexValidator.java
@@ -2,7 +2,7 @@ package com.supwisdom.dlpay.api.validator;
 
 
 import com.supwisdom.dlpay.api.annotation.Sex;
-import com.supwisdom.dlpay.api.util.SexTypes;
+import com.supwisdom.dlpay.api.types.SexTypes;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/ShopTypeValidator.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/ShopTypeValidator.java
index bcd7e963..f04c41d1 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/ShopTypeValidator.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/validator/ShopTypeValidator.java
@@ -1,7 +1,7 @@
 package com.supwisdom.dlpay.api.validator;
 
 import com.supwisdom.dlpay.api.annotation.ShopType;
-import com.supwisdom.dlpay.api.util.ShopTypes;
+import com.supwisdom.dlpay.api.types.ShopTypes;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/payapi-common/src/test/java/com/supwisdom/dlpay/api/bean/CitizenCardPayinitParamTest.java b/payapi-common/src/test/java/com/supwisdom/dlpay/api/bean/CitizenCardPayinitParamTest.java
index 680fb98d..0b3dd8b1 100644
--- a/payapi-common/src/test/java/com/supwisdom/dlpay/api/bean/CitizenCardPayinitParamTest.java
+++ b/payapi-common/src/test/java/com/supwisdom/dlpay/api/bean/CitizenCardPayinitParamTest.java
@@ -1,7 +1,7 @@
 package com.supwisdom.dlpay.api.bean;
 
-import com.supwisdom.dlpay.api.util.IDTypes;
-import com.supwisdom.dlpay.api.util.SexTypes;
+import com.supwisdom.dlpay.api.types.IDTypes;
+import com.supwisdom.dlpay.api.types.SexTypes;
 import org.junit.Test;
 
 import javax.validation.ConstraintViolation;
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/system/controller/ShopController.java b/payapi/src/main/java/com/supwisdom/dlpay/system/controller/ShopController.java
index cb762831..e2d4d9b8 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/system/controller/ShopController.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/system/controller/ShopController.java
@@ -4,7 +4,7 @@ import com.supwisdom.dlpay.api.bean.JsonResult;
 import com.supwisdom.dlpay.api.domain.TSourceType;
 import com.supwisdom.dlpay.api.domain.TShopSourceType;
 import com.supwisdom.dlpay.api.domain.TShopSourceTypeConfig;
-import com.supwisdom.dlpay.api.util.ShopTypes;
+import com.supwisdom.dlpay.api.types.ShopTypes;
 import com.supwisdom.dlpay.framework.domain.TShop;
 import com.supwisdom.dlpay.framework.domain.TShopacc;
 import com.supwisdom.dlpay.framework.service.SystemUtilService;
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java
index 9c0232b5..e85609c6 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java
@@ -1,6 +1,6 @@
 package com.supwisdom.dlpay.system.service.impl;
 
-import com.supwisdom.dlpay.api.util.ShopTypes;
+import com.supwisdom.dlpay.api.types.ShopTypes;
 import com.supwisdom.dlpay.framework.dao.*;
 import com.supwisdom.dlpay.framework.domain.TSettlectl;
 import com.supwisdom.dlpay.framework.domain.TShop;
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java
index 51981fd2..84339174 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java
@@ -8,7 +8,7 @@ import com.supwisdom.dlpay.api.domain.TSourceType;
 import com.supwisdom.dlpay.api.domain.TSourceTypeConfig;
 import com.supwisdom.dlpay.api.domain.TShopSourceType;
 import com.supwisdom.dlpay.api.domain.TShopSourceTypeConfig;
-import com.supwisdom.dlpay.api.util.ShopTypes;
+import com.supwisdom.dlpay.api.types.ShopTypes;
 import com.supwisdom.dlpay.framework.dao.ShopDao;
 import com.supwisdom.dlpay.framework.dao.ShopaccDao;
 import com.supwisdom.dlpay.framework.data.SystemDateTime;
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/shop_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/shop_service_impl.kt
index 068cca72..0908b84d 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/shop_service_impl.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/shop_service_impl.kt
@@ -2,7 +2,7 @@ package com.supwisdom.dlpay.api.service.impl
 
 import com.supwisdom.dlpay.api.bean.OpenShopParam
 import com.supwisdom.dlpay.api.service.ShopService
-import com.supwisdom.dlpay.api.util.ShopTypes
+import com.supwisdom.dlpay.api.types.ShopTypes
 import com.supwisdom.dlpay.exception.TransactionProcessException
 import com.supwisdom.dlpay.framework.dao.ShopDao
 import com.supwisdom.dlpay.framework.dao.ShopaccDao