diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcWorkPointsVerificationFormDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcWorkPointsVerificationFormDTO.java index 790ef714..510c19b8 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcWorkPointsVerificationFormDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcWorkPointsVerificationFormDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; import java.io.Serializable; /** @@ -33,4 +34,11 @@ public class EpdcWorkPointsVerificationFormDTO implements Serializable { */ @Min(value = 1, message = "操作积分值必须大于0") private Integer points; + + /** + * 备注 + */ + @NotBlank(message = "核销说明不能为空") + @Size(min = 1, max = 10, message = "核销说明10字以内") + private String remark; } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiUserPointsVerificationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiUserPointsVerificationController.java index 7cd54628..af2b5bb5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiUserPointsVerificationController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiUserPointsVerificationController.java @@ -57,7 +57,7 @@ public class ApiUserPointsVerificationController { * @since 2021/1/19 14:16 */ @GetMapping("getpointslogs") - public Result> getPointsLogs(@LoginUser TokenDto userDetail, @RequestBody PointsExchangeLogsFormDTO formDto) { + public Result> getPointsLogs(@LoginUser TokenDto userDetail, PointsExchangeLogsFormDTO formDto) { ValidatorUtils.validateEntity(formDto); formDto.setUserId(userDetail.getUserId()); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkPointsVerificationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkPointsVerificationController.java index 8b787449..52d1a145 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkPointsVerificationController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkPointsVerificationController.java @@ -65,7 +65,7 @@ public class ApiWorkPointsVerificationController { * @since 2021/1/19 17:00 */ @GetMapping("verificationlogs") - public Result verificationLogs(@RequestBody EpdcWorkVerificationLogsFormDTO formDto) { + public Result verificationLogs(EpdcWorkVerificationLogsFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return userPointsVerificationService.listOfVerificationLogs(formDto); diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java index c9615a6a..2acda01c 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/PointsLogsDTO.java @@ -170,10 +170,15 @@ public class PointsLogsDTO implements Serializable { /** * 操作人所属部门ID */ - private String createdDeptId; + private Long createdDeptId; /** * 操作人所属部门所有部门ID */ private String createdDeptAllDeptIds; + /** + * 备注 + */ + private String remark; + } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsLogsResultDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsLogsResultDTO.java index ced14a96..612d3a08 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsLogsResultDTO.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsLogsResultDTO.java @@ -132,4 +132,9 @@ public class PointsLogsResultDTO implements Serializable { */ private Date updatedTime; -} \ No newline at end of file + /** + * 备注 + */ + private String remark; + +} diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java index 8d92317d..a9975b22 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java @@ -142,4 +142,9 @@ public class PointsLogsEntity extends BaseEpdcEntity { */ private String createdDeptAllDeptIds; + /** + * 备注 + */ + private String remark; + } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java index 62c44499..43ddddca 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java @@ -494,6 +494,7 @@ public class PointsLogsServiceImpl extends BaseServiceImpl userGridIdByUserId = usersFeignClient.getUserGridIdByUserId(formDto.getUserId()); diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml index 361d759d..fa9641ed 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml @@ -280,7 +280,8 @@ OPERATION_DESC, OPERATION_TIME, OPERATION_TYPE, - POINTS + POINTS, + REMARK FROM epdc_points_logs WHERE @@ -301,7 +302,8 @@ OPERATION_DESC, OPERATION_TIME, OPERATION_TYPE, - POINTS + POINTS, + REMARK FROM epdc_points_logs WHERE diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index f2870cfa..3bac1324 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -980,12 +980,13 @@ public class UserServiceImpl extends BaseServiceImpl implem if (null == userEntity) { return new Result().error("未查询到改用户"); } + int points = null == userEntity.getPoints() ? 0 : userEntity.getPoints(); + int pointsTotal = null == userEntity.getPointsTotle() ? 0 : userEntity.getPointsTotle(); //规则操作类型(0-减积分，1-加积分) if (PointsOperationEnum.OPERATION_TYPE_ADD.getOperationType().equals(formDTO.getOperationType())) { - userEntity.setPoints(userEntity.getPoints() + formDTO.getPoints()); - userEntity.setPointsTotle(userEntity.getPointsTotle() + formDTO.getPoints()); + userEntity.setPoints(points + formDTO.getPoints()); + userEntity.setPointsTotle(pointsTotal + formDTO.getPoints()); } else if (PointsOperationEnum.OPERATION_TYPE_SUBSTRACT.getOperationType().equals(formDTO.getOperationType())) { - int points = null == userEntity.getPoints() ? 0 : userEntity.getPoints(); if (formDTO.getPoints() > points) { return new Result().error("用户积分不足"); }