Merge branch 'dev' into release

epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-point-server:
     container_name: epmet-point-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.21
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.22
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

epmet-module/epmet-point/epmet-point-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.21</version>
+    <version>0.0.22</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

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();
             }

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 = "添加活动实况";
 }

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.93
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.94
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.93</version>
+    <version>0.0.94</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java

@@ -182,6 +182,7 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
             userEntity.setPhone(formDTO.getPhone());
             userEntity.setRealName(formDTO.getSurName());
             userEntity.setGender(formDTO.getGender().toString());
+            userEntity.setSource(formDTO.getSource());
             if (paUserDao.insert(userEntity) < NumConstant.ONE) {
                 throw new RenException(PaConstant.SAVE_USER_EXCEPTION);
             }