diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java index c30ee3c1d6..21336dccb2 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java @@ -2,6 +2,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -42,6 +44,7 @@ public class AdjustmentController { * @date 2020.07.27 10:57 **/ @PostMapping("userlist") + @RequirePermission(requirePermission = RequirePermissionEnum.MORE_POINT_USER_MANAGE_LIST) public Result> userList(@RequestBody CustomerUserFormDTO param){ ValidatorUtils.validateEntity(param, CustomerUserFormDTO.CustomerIdGroup.class); return epmetUserOpenFeignClient.customerUserList(param); @@ -55,6 +58,7 @@ public class AdjustmentController { * @date 2020.07.27 11:15 **/ @PostMapping("userdetail") + @RequirePermission(requirePermission = RequirePermissionEnum.MORE_POINT_USER_MANAGE_DETAIL_VIEW) public Result userDetail(@RequestBody IssueInitiatorFormDTO param){ ValidatorUtils.validateEntity(param,IssueInitiatorFormDTO.UserIdGroup.class); return new Result().ok(pointAdjustmentLogService.userDetail(param)); @@ -68,6 +72,7 @@ public class AdjustmentController { * @date 2020.07.27 10:51 **/ @PostMapping("adjustrecord") + @RequirePermission(requirePermission = RequirePermissionEnum.MORE_POINT_USER_MANAGE_ADJUST_REC_VIEW) public Result> adjustRecord(@RequestBody IssueInitiatorFormDTO param){ ValidatorUtils.validateEntity(param, IssueInitiatorFormDTO.UserIdGroup.class); return new Result>().ok(pointAdjustmentLogService.adjustRecord(param)); @@ -81,6 +86,7 @@ public class AdjustmentController { * @date 2020.07.27 13:52 **/ @PostMapping("adjust") + @RequirePermission(requirePermission = RequirePermissionEnum.MORE_POINT_USER_MANAGE_ADJUST_POINT) public Result adjustPoint(@LoginUser TokenDto token, @RequestBody PointAdjustmentFormDTO param){ param.setOperatorId(token.getUserId()); param.setCustomerId(token.getCustomerId()); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java index bfbcff6ebb..526e56fa46 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java @@ -1,6 +1,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -40,6 +42,7 @@ public class PointRuleController { * @return */ @PostMapping(value = "functionlist") + @RequirePermission( requirePermission = RequirePermissionEnum.MORE_POINT_RULE_FUNCTION_LIST) public Result> getFunctionList(@LoginUser TokenDto tokenDTO) { return new Result>().ok(pointRuleService.getFunctionList(tokenDTO.getCustomerId())); } @@ -52,6 +55,7 @@ public class PointRuleController { * @return */ @PostMapping(value = "list") + @RequirePermission( requirePermission = RequirePermissionEnum.MORE_POINT_RULE_LIST) public Result> list( @RequestBody PointRuleListFormDTO formDTO) { formDTO.setCustomerId("3ef7e4bb195eb9e622d68b52509aa940"); ValidatorUtils.validateEntity(formDTO); @@ -65,6 +69,7 @@ public class PointRuleController { * @return */ @PostMapping(value = "detail") + @RequirePermission( requirePermission = RequirePermissionEnum.MORE_POINT_RULE_DETAIL) public Result detail(@RequestBody PointDetailFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return new Result().ok(pointRuleService.detail(formDTO)); @@ -77,6 +82,7 @@ public class PointRuleController { * @return */ @PostMapping(value = "update") + @RequirePermission( requirePermission = RequirePermissionEnum.MORE_POINT_RULE_SAVE) public Result update(@LoginUser TokenDto tokenDTO, @RequestBody PointRuleFormDTO formDTO) { formDTO.setCustomerId(tokenDTO.getCustomerId()); ValidatorUtils.validateEntity(formDTO, UpdateGroup.class); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index 87466df5d7..f57c3d4fbe 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -32,7 +32,6 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dao.UserPointActionLogDao; import com.epmet.dto.UserPointActionLogDTO; import com.epmet.dto.form.CommonPageUserFormDTO; -import com.epmet.dto.form.PointRuleListFormDTO; import com.epmet.dto.result.ResiPointLogListResultDTO; import com.epmet.dto.result.ResiPointLogPeriodResultDTO; import com.epmet.entity.PointRuleEntity; @@ -49,8 +48,6 @@ import com.google.common.collect.Maps; import dto.form.SendPointFormDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.Validate; -import org.bouncycastle.math.raw.Mod; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -193,7 +190,6 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl【%s】", JSON.toJSON(event))); throw new RenException("无法识别事件类型与积分规则"); } - PointRuleEntity ruleInfo = pointRuleService.getByEventCodeAndCustomerId(event.getCustomerId(),eventCode); if(null != ruleInfo && StringUtils.equals(NumConstant.ONE_STR,ruleInfo.getEnabledFlag())){ Date dateCheck = null; @@ -219,22 +215,22 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl NumConstant.ZERO){ //保证要扣减的积分是负数 ruleInfo.setPoint(ruleInfo.getPoint() * NumConstant.ONE_NEG); } + sum += ruleInfo.getPoint(); + sum *= NumConstant.ONE_NEG; } //这里sum一定是正数 - if(ruleInfo.getUpLimit() < (sum + ruleInfo.getPoint())){ + if(ruleInfo.getUpLimit() < sum){ log.info(String.format("该用户获取此类事件的积分已达上限,详细数据->【%s】", JSON.toJSON(event))); return ; } @@ -242,14 +238,27 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl