From 383725a6f64ef99b5b384ffa94b070ba53961013 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Sat, 8 Feb 2020 19:39:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=B4=BB=E5=8A=A8=E6=89=A3?=
 =?UTF-8?q?=E5=87=8F=E7=A7=AF=E5=88=86=E7=BB=99=E7=94=A8=E6=88=B7=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/constant/HeartNoticeConstant.java    |  6 +++++
 .../impl/ActUserRelationServiceImpl.java      | 24 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java
index 214af08b8..ff53def03 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java
@@ -45,4 +45,10 @@ public interface HeartNoticeConstant {
 	 * 打卡积分-确认加积分
 	 */
 	String NOTICE_CONFIRM_ADD_ACT_POINTS = "您参与的活动【确认积分】";
+
+	/**
+	 * 取消报名title
+	 */
+	String CANCEL_ACT_TITLE = "取消报名【扣减积分】";
+
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
index aa74b03a0..3a5cb6e69 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
@@ -346,9 +346,33 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         pointsLogsDTO.setStatus(YesOrNoEnum.YES.value());
         pointsLogsDTO.setReferenceId(actUserPointsLog.getId());
         pointsFeignClient.addPointsLog(pointsLogsDTO);
+        //发送消息通知
+        this.sendUserInformation(actUserRelationDTO, actInfoDTO);
+    }
+
+    /**
+     * @param actUserRelationDTO
+     * @param actInfoDTO
+     * @return void
+     * @Author yinzuomei
+     * @Description 取消活动扣减积分发送用户消息
+     * @Date 2020/2/8 19:37
+     **/
+    private void sendUserInformation(ActUserRelationDTO actUserRelationDTO, ActInfoDTO actInfoDTO) {
+        EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO();
+        informationFormDTO.setTitle(HeartNoticeConstant.CANCEL_ACT_TITLE);
+        informationFormDTO.setUserId(actUserRelationDTO.getUserId());
+        informationFormDTO.setType(HeartNoticeConstant.NOTICE_TYPE_INTERACTIVE_NOTICE);
+        informationFormDTO.setBusinessType(HeartNoticeConstant.NOTICE__BUSINESS_TYPE_ACTIVITY);
+        informationFormDTO.setBusinessId(actUserRelationDTO.getActId());
+//        您未参加“活动名称”，根据规则未参加将扣除积分
+        informationFormDTO.setContent("您未参加“" + actInfoDTO.getTitle() + "”，根据规则未参加将扣除积分" + actInfoDTO.getPunishmentPoints());
+        informationFormDTO.setRelBusinessContent(actInfoDTO.getTitle());
+        newsTask.insertUserInformation(informationFormDTO);
     }
 
     @Override
+
     public ActUserRelationDTO getActUserRelationId(String userId, String actId, List<String> statusList) {
         List<ActUserRelationDTO> data = baseDao.selectOneActUserRelationInfo(userId, actId, statusList);
         ActUserRelationDTO actUserRelationDTO = new ActUserRelationDTO();