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 7a8dd2d..31ae96f 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 @@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO; import com.elink.esua.epdc.dto.PointsLogsDTO; +import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; import com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO; import com.elink.esua.epdc.excel.PointsLogsExcel; @@ -148,4 +149,16 @@ public class PointsLogsController { public Result pointsOverview(@RequestParam Map params) { return new Result().ok(pointsLogsService.getPointsOverview(params)); } + + /** + * @Description 新增用户清零积分记录 + * @Author zy + * @Date 2021/7/15 + * @Param [idList] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("insertPointsResetLogs") + public Result insertPointsResetLogs(@RequestBody List formDTO) { + return pointsLogsService.insertPointsResetLogs(formDTO); + } } diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java index d9387f3..1d8928b 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java @@ -143,4 +143,14 @@ public interface PointsLogsDao extends BaseDao { * @date 2020/7/21 10:37 */ PointsStatisticsListResultDTO selectPointsOverview(Map params); + + /** + * 批量新增 + * + * @param list + * @return void + * @Author zhangyong + * @Date 17:02 2022-02-12 + **/ + void insertBatchPointsResetLogs(List list); } diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java index cc304d0..fc10571 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java @@ -133,4 +133,14 @@ public class PointsLogsEntity extends BaseEpdcEntity { * 所有部门 */ private String allDeptNames; + + /** + * 备注 + */ + private String remark; + + /** + * 用户真实姓名 + */ + private String realName; } 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 f5cf797..0a91526 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 @@ -67,5 +67,15 @@ public interface UsersFeignClient { **/ @GetMapping(value = "app-user/usergrid/getUserFirstScanGird/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) Result getUserFirstScanGird(@PathVariable("userId") String userId); + + /** + * @Description 季度重置用户可兑换积分 - 数据库操作 - points调用 + * @Author zy + * @Date 2021/8/1 + * @Param + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping(value = "app-user/user/resetUserPoints", consumes = MediaType.APPLICATION_JSON_VALUE) + Result resetUserPoints(); } 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 dcfd9da..01279ca 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 @@ -40,4 +40,9 @@ public class UsersFeignClientFallback implements UsersFeignClient { public Result getUserFirstScanGird(String userId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserFirstScanGird", userId); } + + @Override + public Result resetUserPoints() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "resetUserPoints"); + } } 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 9e506aa..47fa07b 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.UserDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; @@ -165,7 +166,7 @@ public interface PointsLogsService extends BaseService { */ EpdcAppPointsRankingResultDTO listPointsRanking(EpdcAppPointsRankingFormDTO formDto); /** - * @Description 积分管理-积分统计 -统计调整积分 + * @Description 积分管理-积分统计 -统计调整积分 * @Author songyunpeng * @Date 2020/6/9 * @Param [formDto] @@ -190,4 +191,13 @@ public interface PointsLogsService extends BaseService { * @date 2020/7/21 10:36 */ PointsStatisticsListResultDTO getPointsOverview(Map params); + + /** + * @Description 新增用户清零积分记录 + * @Author zy + * @Date 2021/7/23 + * @Param [form] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result insertPointsResetLogs(List 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 4f81f6d..f4a85ee 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 @@ -24,6 +24,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.PointsConstant; +import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationModeEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; @@ -53,6 +54,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; /** * 积分记录表 积分记录表 @@ -339,4 +341,39 @@ public class PointsLogsServiceImpl extends BaseServiceImpl params) { return baseDao.selectPointsOverview(params); } + + @Override + public Result insertPointsResetLogs(List formDTO) { + List list = new ArrayList<>(); + Result behaviorCodeInfoByBehaviorCode = pointsBehaviorService.getBehaviorCodeInfoByBehaviorCode(BehaviorEnum.POINTS_RESET.getValue()); + for (UserDTO formDto : formDTO) { + //根据动作编码获取动作信息 + 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.resetUserPoints(); + return new Result(); + } } diff --git a/epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml b/epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml index 49182ef..624bddd 100644 --- a/epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml +++ b/epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml @@ -223,4 +223,11 @@ ORDER BY lg.OPERATION_TYPE DESC + + + insert into epdc_points_logs(ID, USER_ID, NICKNAME, REFERENCE_ID, RULE_CODE, BEHAVIOR_CODE, OPERATION_TYPE, POINTS, OPERATION_DESC, OPERATION_TIME, OPERATION_MODE, LAVE_POINTS, REVISION, DEL_FLAG, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, FACE_IMG, VOLUNTEER_ID, GRID_ID, GRID, ALL_DEPT_IDS, ALL_DEPT_NAMES, PARENT_DEPT_IDS, PARENT_DEPT_NAMES,REMARK, REAL_NAME) VALUES + + (MD5(UUID()),#{points.userId},#{points.nickname},#{points.referenceId},#{points.ruleCode},#{points.behaviorCode},#{points.operationType},#{points.points},#{points.operationDesc},#{points.operationTime},#{points.operationMode},#{points.lavePoints},0,0,0,now(),0,now(),#{points.faceImg},#{points.volunteerId},#{points.gridId},#{points.grid},#{points.allDeptIds},#{points.allDeptNames},#{points.parentDeptIds},#{points.parentDeptNames},#{points.remark},#{points.realName}) + +