积分核销新增核销说明字段

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;
 }

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<List<PointsLogsResultDTO>> getPointsLogs(@LoginUser TokenDto userDetail, @RequestBody PointsExchangeLogsFormDTO formDto) {
+    public Result<List<PointsLogsResultDTO>> getPointsLogs(@LoginUser TokenDto userDetail, PointsExchangeLogsFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         formDto.setUserId(userDetail.getUserId());
 

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<EpdcVerificationLogsResultDTO> verificationLogs(@RequestBody EpdcWorkVerificationLogsFormDTO formDto) {
+    public Result<EpdcVerificationLogsResultDTO> verificationLogs(EpdcWorkVerificationLogsFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
 
         return userPointsVerificationService.listOfVerificationLogs(formDto);

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;
+
 }

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;
 
-}
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+}

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;
+
 }

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<PointsLogsDao, Points
         pointsLogsEntity.setOperationType(formDto.getOperationType());
         pointsLogsEntity.setReferenceId(formDto.getUserId());
         pointsLogsEntity.setLavePoints(userDto.getPoints());
+        pointsLogsEntity.setRemark(formDto.getRemark());
 
         // 赋值积分所属部门
         Result<Long> userGridIdByUserId = usersFeignClient.getUserGridIdByUserId(formDto.getUserId());

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

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<UserDao, UserEntity> 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("用户积分不足");
             }