From 04c49d5cce48bf0c824471acd525c9a295705fe6 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Fri, 27 Sep 2019 11:21:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=B6=88=E6=81=AF=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/service/impl/MessageServiceImpl.java | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java
index 148a26649..ede2ef118 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java
@@ -37,6 +37,21 @@ public class MessageServiceImpl implements MessageService {
     @Autowired
     private WxMaService wxMaService;
 
+    /**
+     * 注册审核失败服务消息模版
+     */
+    private static String FAILURE_TEMPLATE_ID = "jL6UPR2ZBcZT8Qu2UijcApvUI2xa3K68paDl8ZZV7as";
+
+    /**
+     * 注册审核成功服务消息模版
+     */
+    private static String SUCCESS_TEMPLATE_ID = "jL6UPR2ZBcZT8Qu2UijcAoGddYg70BGAyFZXyr4XBSY";
+
+    /**
+     * 服务消息跳转小程序页面
+     */
+    private static String MA_PAGE = "pages/index/index";
+
     /**
      * 发送六位短信验证码
      *
@@ -69,18 +84,13 @@ public class MessageServiceImpl implements MessageService {
             return new Result().error("没有可用的wxFormId");
         }
 
-        switch (userAuditStateEnum) {
-            case AUDIT_FAILURE:
-                this.sendRegisterFailureMaMsg(registerAuditResultDto);
-                this.deleteWxFormId(registerAuditResultDto.getWxFormIdId());
-                break;
-            case AUDIT_SUCCESS:
-                this.sendRegisterSuccessMaMsg(registerAuditResultDto);
-                this.deleteWxFormId(registerAuditResultDto.getWxFormIdId());
-                break;
-            default:
-                break;
+        if (state.equals(AppUserAuditStateEnum.AUDIT_SUCCESS.value())) {
+            this.sendRegisterSuccessMaMsg(registerAuditResultDto);
+        } else {
+            this.sendRegisterFailureMaMsg(registerAuditResultDto);
         }
+        this.deleteWxFormId(registerAuditResultDto.getWxFormIdId());
+
         return new Result();
     }
 
@@ -126,8 +136,8 @@ public class MessageServiceImpl implements MessageService {
                 .isMpTemplateMsg(false)
                 .toUser(registerAuditResultDto.getWxOpenId())
                 .formId(registerAuditResultDto.getWxFormId())
-                .templateId("jL6UPR2ZBcZT8Qu2UijcApvUI2xa3K68paDl8ZZV7as")
-                .page("/pages/index/index")
+                .templateId(FAILURE_TEMPLATE_ID)
+                .page(MA_PAGE)
                 .data(dataList)
                 .emphasisKeyword("keyword6.DATA")
                 .build();
@@ -161,8 +171,8 @@ public class MessageServiceImpl implements MessageService {
                 .isMpTemplateMsg(false)
                 .toUser(registerAuditResultDto.getWxOpenId())
                 .formId(registerAuditResultDto.getWxFormId())
-                .templateId("jL6UPR2ZBcZT8Qu2UijcAoGddYg70BGAyFZXyr4XBSY")
-                .page("/pages/index/index")
+                .templateId(SUCCESS_TEMPLATE_ID)
+                .page(MA_PAGE)
                 .data(dataList)
                 .emphasisKeyword("keyword5.DATA")
                 .build();