From c39fffa66471188960fe95a4d7ac242013d8be6e Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Wed, 8 Apr 2020 14:59:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/VolunteerInfoNoticeConstant.java | 25 ++++++++++---------
 .../impl/VolunteerInfoServiceImpl.java        | 16 +++++++-----
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/VolunteerInfoNoticeConstant.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/VolunteerInfoNoticeConstant.java
index 0c5bad37d..2c8c0b9b0 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/VolunteerInfoNoticeConstant.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/VolunteerInfoNoticeConstant.java
@@ -6,17 +6,18 @@ package com.elink.esua.epdc.constant;
  * @Date 2020/2/7 12:20
  */
 public interface VolunteerInfoNoticeConstant {
-	/**
-	 * 志愿者审核未通过
-	 */
-	String NOTICE_CERTIFICATION_NOT_PASSED = "您的志愿者认证【审核未通过】";
-	/**
-	 * 消息所属业务类型：volunteer志愿者审核
-	 */
-	String NOTICE__BUSINESS_TYPE_VOLUNTEER = "volunteer";
+    /**
+     * 志愿者审核未通过
+     */
+    String NOTICE_CERTIFICATION_NOT_PASSED = "您的志愿者认证【审核未通过】";
+    String NOTICE_CERTIFICATION_PASSED = "您的志愿者认证【审核通过】";
+    /**
+     * 消息所属业务类型：volunteer志愿者审核
+     */
+    String NOTICE__BUSINESS_TYPE_VOLUNTEER = "volunteer";
 
-	/**
-	 * 我的消息类型：0审核通知
-	 */
-	String NOTICE_TYPE_AUDIT_NOTICE = "0";
+    /**
+     * 我的消息类型：0审核通知
+     */
+    String NOTICE_TYPE_AUDIT_NOTICE = "0";
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
index 9e511f5e2..7e829d571 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
@@ -325,29 +325,33 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
             if (StringUtils.isBlank(volunteerInfoDTO.getFailureReason())) {
                 return new Result().error("请填写原因");
             }
-            sendInfo(dto, volunteerInfoDTO);
         } else {
             //2、审核通过-新增用户标签关系表（此方法里面实现了更新redis里的userTagInfos）
             if (isVolunteer(volunteerInfoDTO.getUserId())) {
                 return new Result().error("当前用户已审核通过，无法操作历史记录");
             }
-            sendInfo(dto, volunteerInfoDTO);
             userTagRelationService.addUserTagRelation(volunteerInfoDTO.getUserId(), UserTagEnum.VOLUNTEER.value());
         }
+        sendInfo(volunteerInfoDTO);
         //3、更新志愿者信息表
         this.update(volunteerInfoDTO);
         return new Result();
     }
 
-    private void sendInfo(VolunteerInfoDTO dto, VolunteerInfoDTO volunteerInfoDTO) {
-        // 1、未通过审核时发送消息-用户可修改信息重新提交
+    private void sendInfo(VolunteerInfoDTO volunteerInfoDTO) {
         EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
+        // 审核通过
+        if (NumConstant.TWO_STR.equals(volunteerInfoDTO.getAuditStatus())) {
+            informationFormDTO.setTitle(VolunteerInfoNoticeConstant.NOTICE_CERTIFICATION_PASSED);
+        } else {
+            informationFormDTO.setTitle(VolunteerInfoNoticeConstant.NOTICE_CERTIFICATION_NOT_PASSED);
+        }
+        informationFormDTO.setContent(volunteerInfoDTO.getFailureReason());
         informationFormDTO.setUserId(volunteerInfoDTO.getUserId());
-        informationFormDTO.setContent(dto.getFailureReason());
         informationFormDTO.setType(VolunteerInfoNoticeConstant.NOTICE_TYPE_AUDIT_NOTICE);
         informationFormDTO.setBusinessType(VolunteerInfoNoticeConstant.NOTICE__BUSINESS_TYPE_VOLUNTEER);
         informationFormDTO.setBusinessId(volunteerInfoDTO.getId());
-        informationFormDTO.setTitle(VolunteerInfoNoticeConstant.NOTICE_CERTIFICATION_NOT_PASSED);
+
         newsTask.insertUserInformation(informationFormDTO);
     }