Browse Source

积分规则修改脚本

dev_shibei_match
zhaoqifeng 4 years ago
parent
commit
cadd9aeb89
  1. 3
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java
  2. 1
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/SourceTypeEnum.java
  3. 4
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java
  4. 3
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/AchievementResultDTO.java
  5. 1
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/GroupAchievementDTO.java
  6. 4
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
  7. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
  8. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
  9. 18
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
  10. 3
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

3
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java

@ -13,7 +13,8 @@ import lombok.Getter;
public enum BizTypeEnum { public enum BizTypeEnum {
//枚举类型 //枚举类型
GROUP("group", "小组"), GROUP("group", "小组"),
ACTIVITY("activity", "活动"); ACTIVITY("activity", "活动"),
AGENCY("agency", "组织");
/** /**
* 类型 * 类型

1
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/SourceTypeEnum.java

@ -17,6 +17,7 @@ public enum SourceTypeEnum {
ISSUE("issue", "议题"), ISSUE("issue", "议题"),
PROJECT("project", "项目"), PROJECT("project", "项目"),
INVITE("invite", "邀请进组"), INVITE("invite", "邀请进组"),
MANUAL("manual", "人工调整"),
VOLUNTEER("volunteer", "志愿者"); VOLUNTEER("volunteer", "志愿者");
/** /**

4
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java

@ -206,6 +206,10 @@ public class PointAdjustmentLogServiceImpl extends BaseServiceImpl<PointAdjustme
userPointActionEntity.setCustomerId(param.getCustomerId()); userPointActionEntity.setCustomerId(param.getCustomerId());
userPointActionEntity.setActionFlag(param.getAdjustmentType()); userPointActionEntity.setActionFlag(param.getAdjustmentType());
userPointActionEntity.setPoint(point); userPointActionEntity.setPoint(point);
userPointActionEntity.setBizType("agency");
userPointActionEntity.setObjectId(agencyId);
userPointActionEntity.setSourceType("manual ");
userPointActionEntity.setSourceId(param.getUserId());
userPointActionEntity.setEventStatement(param.getReason()); userPointActionEntity.setEventStatement(param.getReason());
userPointActionEntity.setEventName(ModuleConstant.EVENT_NAME_ADJUSTMENT); userPointActionEntity.setEventName(ModuleConstant.EVENT_NAME_ADJUSTMENT);
userPointActionEntity.setOperatorAgencyId(agencyId); userPointActionEntity.setOperatorAgencyId(agencyId);

3
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/AchievementResultDTO.java

@ -13,5 +13,6 @@ import java.util.List;
@Data @Data
public class AchievementResultDTO implements Serializable { public class AchievementResultDTO implements Serializable {
private static final long serialVersionUID = 8079550501852632061L; private static final long serialVersionUID = 8079550501852632061L;
private List<String> achievement; private String groupId;
private String achievementDesc;
} }

1
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/GroupAchievementDTO.java

@ -12,6 +12,7 @@ import java.io.Serializable;
@Data @Data
public class GroupAchievementDTO implements Serializable { public class GroupAchievementDTO implements Serializable {
private static final long serialVersionUID = 2195790168656351743L; private static final long serialVersionUID = 2195790168656351743L;
private String groupId;
private String groupName; private String groupName;
private String achievementName; private String achievementName;
} }

4
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

@ -557,8 +557,8 @@ public class ResiGroupController {
* @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.member.result.AchievementResultDTO> * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.member.result.AchievementResultDTO>
*/ */
@PostMapping("achievement") @PostMapping("achievement")
public Result<AchievementResultDTO> achievement(@LoginUser TokenDto tokenDto) { public Result<List<AchievementResultDTO>> achievement(@LoginUser TokenDto tokenDto, @RequestBody GroupFormDTO formDTO) {
return new Result<AchievementResultDTO>().ok(resiGroupService.achievement(tokenDto)); return new Result<List<AchievementResultDTO>>().ok(resiGroupService.achievement(tokenDto, formDTO));
} }
/** /**

2
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java

@ -245,5 +245,5 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
* @param userId * @param userId
* @return java.util.List<com.epmet.resi.group.dto.member.result.GroupAchievementDTO> * @return java.util.List<com.epmet.resi.group.dto.member.result.GroupAchievementDTO>
*/ */
List<GroupAchievementDTO> selectRecentGroupAchievements(@Param("userId") String userId); List<GroupAchievementDTO> selectRecentGroupAchievements(@Param("userId") String userId, @Param("gridId") String gridId);
} }

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

@ -408,7 +408,7 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
* @param tokenDto * @param tokenDto
* @return com.epmet.resi.group.dto.member.result.AchievementResultDTO * @return com.epmet.resi.group.dto.member.result.AchievementResultDTO
*/ */
AchievementResultDTO achievement(TokenDto tokenDto); List<AchievementResultDTO> achievement(TokenDto tokenDto, GroupFormDTO formDTO);
/** /**
* 获取小组信息及小组成员 * 获取小组信息及小组成员

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

@ -1278,14 +1278,20 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
* @date 2021/4/22 9:27 * @date 2021/4/22 9:27
*/ */
@Override @Override
public AchievementResultDTO achievement(TokenDto tokenDto) { public List<AchievementResultDTO> achievement(TokenDto tokenDto, GroupFormDTO formDTO) {
AchievementResultDTO result = new AchievementResultDTO(); List<AchievementResultDTO> result = new ArrayList<>();
List<String> achievements = new ArrayList<>();
List<GroupAchievementDTO> list = baseDao.selectRecentGroupAchievements(tokenDto.getUserId()); List<GroupAchievementDTO> list = baseDao.selectRecentGroupAchievements(tokenDto.getUserId(), formDTO.getGridId());
if (CollectionUtils.isNotEmpty(list)) { if (CollectionUtils.isNotEmpty(list)) {
achievements = list.stream().map(item -> item.getGroupName() + ":" + "达成“" + item.getAchievementName() + "”" + "成就").collect(Collectors.toList()); result =
list.stream().map(item -> {
AchievementResultDTO dto = new AchievementResultDTO();
String desc = item.getGroupName() + ":" + "达成“" + item.getAchievementName() + "”" + "成就";
dto.setAchievementDesc(desc);
dto.setGroupId(item.getGroupId());
return dto;
}).collect(Collectors.toList());
} }
result.setAchievement(achievements);
return result; return result;
} }

3
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@ -526,11 +526,12 @@
</select> </select>
<select id="selectRecentGroupAchievements" resultType="com.epmet.resi.group.dto.member.result.GroupAchievementDTO"> <select id="selectRecentGroupAchievements" resultType="com.epmet.resi.group.dto.member.result.GroupAchievementDTO">
SELECT SELECT
rgas.GROUP_ID,
rg.GROUP_NAME, rg.GROUP_NAME,
rgas.ACHIEVEMENT_NAME rgas.ACHIEVEMENT_NAME
FROM FROM
resi_group_achievement_stats rgas resi_group_achievement_stats rgas
INNER JOIN resi_group rg ON rgas.GROUP_ID = rg.ID INNER JOIN resi_group rg ON rgas.GROUP_ID = rg.ID AND rg.GRID_ID = #{gridId}
INNER JOIN resi_group_member rgm ON rgas.GROUP_ID = rgm.RESI_GROUP_ID INNER JOIN resi_group_member rgm ON rgas.GROUP_ID = rgm.RESI_GROUP_ID
AND rgm.CUSTOMER_USER_ID = #{userId} AND rgm.CUSTOMER_USER_ID = #{userId}
WHERE WHERE

Loading…
Cancel
Save