From d2dc89d73268f3e9aaa52a3a5a701316a5d255c9 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 4 Aug 2020 09:48:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BA=8B=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=B8=8E=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserPointActionLogServiceImpl.java      | 9 ++++++---
 .../src/main/java/com/epmet/utils/ModuleConstant.java    | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
index f57c3d4fbe..763bc831c4 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
@@ -243,11 +243,14 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
             String eventStatement = eventName;
 
             if(EventEnum.ACTIVE_INSERT_LIVE.getEventTag().equals(eventCode)){
-                eventName = ModuleConstant.EVENT_NAME_VOLUNTEER;
-            }else if(EventEnum.REGISTER_VOLUNTEER.getEventTag().equals(eventCode)){
-                eventName = ModuleConstant.EVENT_NAME_PARTICIPATED_ACT;
+                eventName = ModuleConstant.EVENT_NAME_ADD_LIVE;
                 eventStatement = event.getRemark();
+            }else if(EventEnum.REGISTER_VOLUNTEER.getEventTag().equals(eventCode)){
+                eventName = ModuleConstant.EVENT_NAME_VOLUNTEER;
+                //志愿者认证不需要备注
             }else{
+                //如果不是添加实况和志愿者注册
+                //则统一使用EventEnum中的eventDesc作为eventStatement，eventTag作为eventId
                 eventName = EventEnum.getEnum(eventCode).getEventDesc();
                 eventStatement = event.getRemark();
             }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java
index e30dac5c21..0d66e32fba 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java
@@ -118,4 +118,6 @@ public interface ModuleConstant extends Constant {
     String EVENT_NAME_VOLUNTEER = "志愿者认证";
 
     String EVENT_NAME_PARTICIPATED_ACT = "参与活动";
+
+    String EVENT_NAME_ADD_LIVE = "添加活动实况";
 }