From bb1ab108a2ce602388da5dc3a21441baf1dbe789 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 13 Apr 2020 10:00:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7-=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/exception/EpmetErrorCode.java | 4 +---
 .../constant/ResiWarmheartedVisitConstant.java            | 4 ++++
 .../service/impl/ResiWarmheartedApplyServiceImpl.java     | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index 1495df359d..aae4ac93fb 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -18,9 +18,7 @@ public enum EpmetErrorCode {
 	MOBILE_GET_CODE_ERROR(8104,"获取验证码失败"),
 	MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"),
 
-    CANNOT_AUDIT_WARM(8201, "未注册居民不能申请热心居民，请先完善居民注册。"),
-    RESI_WARM_INIT(8202, "您的信息已提交成功，请等待后台审核。"),
-    RESI_WARM_SUBMIT(8203, "热心居民信息已提交成功，请等待后台审核。");
+    CANNOT_AUDIT_WARM(8201, "未注册居民不能申请热心居民，请先完善居民注册。");
 
 
 	private int code;
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java
index 57c6199abc..c2bdf566af 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java
@@ -46,6 +46,10 @@ public interface ResiWarmheartedVisitConstant {
      */
     String REJECTED = "rejected";
 
+    String RESI_WARM_INIT = "您的信息已提交成功，请等待后台审核。";
+
+    String RESI_WARM_SUBMIT = "热心居民信息已提交成功，请等待后台审核。";
+
     /**
      * 数据库操作异常
      */
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
index 6955858e65..8bbeeeb6f6 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
@@ -157,8 +157,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
             resiWarmheartedResultDTO.setIsApplied(NumConstant.ZERO_STR);
         } else {
             resiWarmheartedResultDTO.setIsApplied(NumConstant.ONE_STR);
-            result.setCode(EpmetErrorCode.RESI_WARM_INIT.getCode());
-            result.setMsg(EpmetErrorCode.RESI_WARM_INIT.getMsg());
+            result.setCode(NumConstant.ZERO);
+            result.setMsg(ResiWarmheartedVisitConstant.RESI_WARM_INIT);
         }
         return result.ok(resiWarmheartedResultDTO);
     }
@@ -179,8 +179,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
             saveResiWarmApply(formDTO);
             //2:将最后一次操作行为更新到热心居民申请行为记录表中
             resiWarmheartedVisitService.updateResiWarmVisit(formDTO);
-            result.setCode(EpmetErrorCode.RESI_WARM_SUBMIT.getCode());
-            result.setMsg(EpmetErrorCode.RESI_WARM_SUBMIT.getMsg());
+            result.setCode(NumConstant.ZERO);
+            result.setMsg(ResiWarmheartedVisitConstant.RESI_WARM_SUBMIT);
         }
         return result;
     }