Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/modules/enums/AchievementTypeEnum.java → epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/AchievementTypeEnum.java

@@ -1,4 +1,4 @@
-package com.epmet.modules.enums;
+package com.epmet.commons.tools.enums;
 
 /**
  * 小组成就类型枚举类

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -36,7 +36,7 @@ import com.epmet.entity.IssueEntity;
 import com.epmet.entity.IssueProcessEntity;
 import com.epmet.entity.IssueProjectRelationEntity;
 import com.epmet.feign.*;
-import com.epmet.modules.enums.AchievementTypeEnum;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.redis.GovIssueRedis;
 import com.epmet.redis.IssueVoteDetailRedis;
 import com.epmet.resi.group.dto.group.form.AllIssueFormDTO;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/AbstractStatsAchievementService.java

@@ -19,10 +19,10 @@ package com.epmet.modules.group.service;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.UniqueIdGenerator;
-import com.epmet.modules.enums.AchievementTypeEnum;
 import com.epmet.modules.group.entity.ResiGroupAchievementConfigEntity;
 import com.epmet.modules.group.entity.ResiGroupAchievementStatsEntity;
 import com.epmet.modules.support.GroupAchievementUtils;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -46,7 +46,7 @@ import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.group.constant.GroupConstant;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
-import com.epmet.modules.enums.AchievementTypeEnum;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.modules.feign.EpmetMessageFeignClient;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java

@@ -9,7 +9,7 @@ import com.epmet.dto.CustomerDTO;
 import com.epmet.dto.IssueDTO;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.feign.OperCrmOpenFeignClient;
-import com.epmet.modules.enums.AchievementTypeEnum;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.modules.group.dao.ResiGroupDao;
 import com.epmet.modules.group.entity.ResiGroupAchievementConfigEntity;
 import com.epmet.modules.group.entity.ResiGroupAchievementStatsEntity;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -45,7 +45,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovIssueOpenFeignClient;
 import com.epmet.modules.constant.GroupMemberConstant;
 import com.epmet.modules.constant.UserMessageConstant;
-import com.epmet.modules.enums.AchievementTypeEnum;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
 import com.epmet.modules.group.dao.ResiGroupDao;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/support/GroupAchievementUtils.java

@@ -3,7 +3,7 @@ package com.epmet.modules.support;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
-import com.epmet.modules.enums.AchievementTypeEnum;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 
 /**
  * desc:小组成就下一等级规则工具类

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -55,7 +55,7 @@ import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.modules.constant.GroupMemberConstant;
 import com.epmet.modules.constant.ResiGroupRedisKeys;
 import com.epmet.modules.constant.WxmpSubscribeConstant;
-import com.epmet.modules.enums.AchievementTypeEnum;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovIssueFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java

@@ -44,7 +44,7 @@ import com.epmet.dto.result.CommonDataFilterResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
-import com.epmet.modules.enums.AchievementTypeEnum;
+import com.epmet.commons.tools.enums.AchievementTypeEnum;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
 import com.epmet.modules.group.dao.GroupMessageDao;