diff --git a/src/main/java/com/sqx/common/aspect/DebounceAspect.java b/src/main/java/com/sqx/common/aspect/DebounceAspect.java index 0b3bb99b..289e1c69 100644 --- a/src/main/java/com/sqx/common/aspect/DebounceAspect.java +++ b/src/main/java/com/sqx/common/aspect/DebounceAspect.java @@ -1,6 +1,7 @@ package com.sqx.common.aspect; import com.sqx.common.annotation.Debounce; +import com.sqx.common.utils.Result; import com.sqx.common.utils.SpelUtil; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; @@ -76,7 +77,7 @@ public class DebounceAspect { return joinPoint.proceed(); } // 在防抖间隔内,不执行目标方法,直接返回 - return null; + return Result.error("请求频繁,请重试"); } private Object debounceForSpecificValue(ProceedingJoinPoint joinPoint, String methodSignature, long interval, TimeUnit timeUnit, Object targetValue) throws Throwable { @@ -89,7 +90,7 @@ public class DebounceAspect { return joinPoint.proceed(); } // 在防抖间隔内,不执行目标方法,直接返回 - return null; + return Result.error("请求频繁,请重试"); } public void cleanExpiredRecords() { diff --git a/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java b/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java index 4b44a3fb..82ff4e6a 100644 --- a/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java +++ b/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java @@ -44,9 +44,8 @@ public class AppUserPrizeExchangeController { @PostMapping("/exchange") @ApiOperation("兑换") public Result exchange(@RequestAttribute("userId") Long userId, @RequestBody UserPrizeExchange entity) { - //userPrizeExchangeService.exchange(userId, entity); - //return Result.success(); - return Result.error("奖品正在路上,请耐心等待"); + userPrizeExchangeService.exchange(userId, entity); + return Result.success(); } @Login diff --git a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java index 0550e5d4..3b498f6f 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java @@ -88,7 +88,7 @@ public class WuyouController { return Result.error("订单已支付"); } if (redisService.setCreateOrderFlagAndCheckLimit(order.getUserId(), orderId)) { - userService.addBlackUser(order.getUserId(), "一分钟频繁下单超12次"); + userService.addBlackUser(order.getUserId(), "一分钟频繁下单超22次"); } PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo()); diff --git a/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java b/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java index 00eef284..b2129794 100644 --- a/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java +++ b/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java @@ -353,6 +353,6 @@ public class RedisServiceImpl implements RedisService { String key = "createOrder:" + userId + ":" + orderId; redisTemplate.opsForValue().set(key, orderId.toString(), 60, TimeUnit.SECONDS); Set keys = redisTemplate.keys("createOrder:" + userId + ":*"); - return keys != null && keys.size() > 12; + return keys != null && keys.size() > 22; } }