Browse Source

积分重置

master
zhangyongzhangyong 4 years ago
parent
commit
5469e1197b
  1. 13
      epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java
  2. 10
      epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java
  3. 10
      epdc-cloud-points/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java
  4. 10
      epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java
  5. 5
      epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java
  6. 12
      epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java
  7. 37
      epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java
  8. 7
      epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml

13
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.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO; import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO;
import com.elink.esua.epdc.dto.PointsLogsDTO; 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.epdc.result.EpdcAdjustVolunteerPointsDTO;
import com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO; import com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO;
import com.elink.esua.epdc.excel.PointsLogsExcel; import com.elink.esua.epdc.excel.PointsLogsExcel;
@ -148,4 +149,16 @@ public class PointsLogsController {
public Result<PointsStatisticsListResultDTO> pointsOverview(@RequestParam Map<String, Object> params) { public Result<PointsStatisticsListResultDTO> pointsOverview(@RequestParam Map<String, Object> params) {
return new Result<PointsStatisticsListResultDTO>().ok(pointsLogsService.getPointsOverview(params)); return new Result<PointsStatisticsListResultDTO>().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<UserDTO> formDTO) {
return pointsLogsService.insertPointsResetLogs(formDTO);
}
} }

10
epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java

@ -143,4 +143,14 @@ public interface PointsLogsDao extends BaseDao<PointsLogsEntity> {
* @date 2020/7/21 10:37 * @date 2020/7/21 10:37
*/ */
PointsStatisticsListResultDTO selectPointsOverview(Map<String, Object> params); PointsStatisticsListResultDTO selectPointsOverview(Map<String, Object> params);
/**
* 批量新增
*
* @param list
* @return void
* @Author zhangyong
* @Date 17:02 2022-02-12
**/
void insertBatchPointsResetLogs(List<PointsLogsEntity> list);
} }

10
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 allDeptNames;
/**
* 备注
*/
private String remark;
/**
* 用户真实姓名
*/
private String realName;
} }

10
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) @GetMapping(value = "app-user/usergrid/getUserFirstScanGird/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<UserGridRelationDTO> getUserFirstScanGird(@PathVariable("userId") String userId); Result<UserGridRelationDTO> 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();
} }

5
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<UserGridRelationDTO> getUserFirstScanGird(String userId) { public Result<UserGridRelationDTO> getUserFirstScanGird(String userId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserFirstScanGird", userId); return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserFirstScanGird", userId);
} }
@Override
public Result resetUserPoints() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "resetUserPoints");
}
} }

12
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.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO; import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO;
import com.elink.esua.epdc.dto.PointsLogsDTO; 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.epdc.result.EpdcAdjustVolunteerPointsDTO;
import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO;
import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO;
@ -165,7 +166,7 @@ public interface PointsLogsService extends BaseService<PointsLogsEntity> {
*/ */
EpdcAppPointsRankingResultDTO listPointsRanking(EpdcAppPointsRankingFormDTO formDto); EpdcAppPointsRankingResultDTO listPointsRanking(EpdcAppPointsRankingFormDTO formDto);
/** /**
* @Description 积分管理-积分统计 -统计调整积分 * @Description 积分管理-积分统计 -统计调整积分
* @Author songyunpeng * @Author songyunpeng
* @Date 2020/6/9 * @Date 2020/6/9
* @Param [formDto] * @Param [formDto]
@ -190,4 +191,13 @@ public interface PointsLogsService extends BaseService<PointsLogsEntity> {
* @date 2020/7/21 10:36 * @date 2020/7/21 10:36
*/ */
PointsStatisticsListResultDTO getPointsOverview(Map<String, Object> params); PointsStatisticsListResultDTO getPointsOverview(Map<String, Object> params);
/**
* @Description 新增用户清零积分记录
* @Author zy
* @Date 2021/7/23
* @Param [form]
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
Result insertPointsResetLogs(List<UserDTO> formDTO);
} }

37
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.FieldConstant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant; 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.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.PointsOperationEnum;
import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationModeEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationModeEnum;
import com.elink.esua.epdc.commons.tools.exception.RenException; 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 org.springframework.transaction.annotation.Transactional;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* 积分记录表 积分记录表 * 积分记录表 积分记录表
@ -339,4 +341,39 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
public PointsStatisticsListResultDTO getPointsOverview(Map<String, Object> params) { public PointsStatisticsListResultDTO getPointsOverview(Map<String, Object> params) {
return baseDao.selectPointsOverview(params); return baseDao.selectPointsOverview(params);
} }
@Override
public Result insertPointsResetLogs(List<UserDTO> formDTO) {
List<PointsLogsEntity> list = new ArrayList<>();
Result<BehaviorResultDto> 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();
}
} }

7
epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml

@ -223,4 +223,11 @@
</if> </if>
ORDER BY lg.OPERATION_TYPE DESC ORDER BY lg.OPERATION_TYPE DESC
</select> </select>
<insert id="insertBatchPointsResetLogs">
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
<foreach collection="list" item="points" separator=",">
(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})
</foreach>
</insert>
</mapper> </mapper>

Loading…
Cancel
Save