diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java index b9f98d3..9e47ec4 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java @@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dao.PointsLogsDao; import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO; import com.elink.esua.epdc.dto.PointsLogsDTO; +import com.elink.esua.epdc.dto.ResetPointsDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; import com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO; @@ -171,4 +172,16 @@ public class PointsLogsController { public Result insertPointsResetLogs(@RequestBody List formDTO) { return pointsLogsService.insertPointsResetLogs(formDTO); } + + /** + * @describe: 新增用户清零积分记录-社区 + * @author wangtong + * @date 2022/4/2 15:57 + * @params [formDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("insertPointsResetLogsCommunity") + public Result insertPointsResetLogsCommunity(@RequestBody ResetPointsDTO formDTO) { + return pointsLogsService.insertPointsResetLogsCommunity(formDTO); + } } diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java index 6d8e714..d5db4ee 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.ResetPointsDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.UserGridRelationDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; @@ -87,5 +88,15 @@ public interface UsersFeignClient { **/ @GetMapping(value = "app-user/epdc-app/user/getUserGridIdByUserId/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) Result getUserGridIdByUserId(@PathVariable String userId); + + /** + * @describe: 按社区清空用户积分 + * @author wangtong + * @date 2022/4/2 16:53 + * @params [formDTO] + * @return voiResultd + */ + @PostMapping(value = "app-user/user/resetUserPointsCommunity", consumes = MediaType.APPLICATION_JSON_VALUE) + Result resetUserPointsCommunity(ResetPointsDTO formDTO); } diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java index 4f9003e..2e406f0 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.ResetPointsDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.UserGridRelationDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; @@ -50,4 +51,9 @@ public class UsersFeignClientFallback implements UsersFeignClient { public Result getUserGridIdByUserId(String userId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserGridIdByUserId", userId); } + + @Override + public Result resetUserPointsCommunity(ResetPointsDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "resetUserPointsCommunity",formDTO); + } } diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java index 3cac59c..8483030 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO; import com.elink.esua.epdc.dto.PointsLogsDTO; +import com.elink.esua.epdc.dto.ResetPointsDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; import com.elink.esua.epdc.dto.form.*; @@ -236,4 +237,12 @@ public interface PointsLogsService extends BaseService { */ EpdcVerificationLogsResultDTO listOfVerificationLogs(EpdcWorkVerificationLogsFormDTO formDto); + /** + * @describe: 新增用户清零积分记录-社区 + * @author wangtong + * @date 2022/4/2 16:12 + * @params [formDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result insertPointsResetLogsCommunity(ResetPointsDTO formDTO); } diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java index f6ae19e..a73262c 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java @@ -34,10 +34,7 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.PointsLogsDao; -import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO; -import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.dto.PointsLogsDTO; -import com.elink.esua.epdc.dto.UserDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.constant.PointsNoticeConstant; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; @@ -57,7 +54,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import java.util.stream.Collectors; /** * 积分记录表 积分记录表 @@ -503,4 +499,39 @@ public class PointsLogsServiceImpl extends BaseServiceImpl list = new ArrayList<>(); + Result behaviorCodeInfoByBehaviorCode = pointsBehaviorService.getBehaviorCodeInfoByBehaviorCode(BehaviorEnum.POINTS_RESET.getValue()); + for (UserDTO formDto : formDTO.getUserList()) { + //根据动作编码获取动作信息 + PointsLogsEntity pointsLogsEntity = new PointsLogsEntity(); + pointsLogsEntity.setUserId(formDto.getId()); + pointsLogsEntity.setNickname(formDto.getNickname()); + pointsLogsEntity.setFaceImg(formDto.getFaceImg()); + pointsLogsEntity.setOperationTime(new Date()); + pointsLogsEntity.setOperationMode(PointsOperationModeEnum.OPERATION_MODE_ADMIN.getOperationMode()); + pointsLogsEntity.setRuleCode(PointsConstant.behaviorCodeCode); + pointsLogsEntity.setBehaviorCode(BehaviorEnum.POINTS_RESET.getValue()); + pointsLogsEntity.setOperationDesc(behaviorCodeInfoByBehaviorCode.getData().getBehaviorDesc()); + pointsLogsEntity.setPoints(formDto.getPoints()); + pointsLogsEntity.setOperationType("0"); + pointsLogsEntity.setReferenceId(formDto.getId()); + pointsLogsEntity.setLavePoints(NumConstant.ZERO); + pointsLogsEntity.setRemark(""); + pointsLogsEntity.setRealName(formDto.getRealName()); + // 赋值积分所属部门 + pointsLogsEntity.setGrid(formDto.getGrid()); + pointsLogsEntity.setGridId(formDto.getGridId()); + pointsLogsEntity.setAllDeptIds(formDto.getAllDeptIds()); + pointsLogsEntity.setAllDeptNames(formDto.getAllDeptNames()); + pointsLogsEntity.setParentDeptIds(formDto.getParentDeptIds()); + pointsLogsEntity.setParentDeptNames(formDto.getParentDeptNames()); + list.add(pointsLogsEntity); + } + baseDao.insertBatchPointsResetLogs(list); + usersFeignClient.resetUserPointsCommunity(formDTO); + return new Result(); + } }