From 5a40b19791ae64b7fc151ded2fb3e4943a48eaed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 8 Apr 2020 14:27:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=97=E6=84=BF=E8=80=85?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E4=B9=9F=E5=8F=91=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/VolunteerInfoServiceImpl.java        | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

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 804403cb7..9e511f5e2 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,20 +325,13 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
             if (StringUtils.isBlank(volunteerInfoDTO.getFailureReason())) {
                 return new Result().error("请填写原因");
             }
-            // 1、未通过审核时发送消息-用户可修改信息重新提交
-            EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
-            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);
+            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());
         }
         //3、更新志愿者信息表
@@ -346,6 +339,18 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         return new Result();
     }
 
+    private void sendInfo(VolunteerInfoDTO dto, VolunteerInfoDTO volunteerInfoDTO) {
+        // 1、未通过审核时发送消息-用户可修改信息重新提交
+        EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
+        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);
+    }
+
     private boolean isVolunteer(String userId) {
         QueryWrapper<VolunteerInfoEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(UserFieldConsant.USER_ID, userId)