Merge branch 'test' into dev
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -350,10 +350,9 @@ public class RedisServiceImpl implements RedisService {
|
||||
|
||||
@Override
|
||||
public boolean setCreateOrderFlagAndCheckLimit(Long userId, Long orderId) {
|
||||
String key = "createOrder:" + userId;
|
||||
redisTemplate.opsForSet().add(key, orderId.toString());
|
||||
redisUtils.expire(key, 60);
|
||||
Set<String> members = redisTemplate.opsForSet().members(key);
|
||||
return members != null && members.size() > 22;
|
||||
String key = "createOrder:" + userId + ":" + orderId;
|
||||
redisTemplate.opsForValue().set(key, orderId.toString(), 60, TimeUnit.SECONDS);
|
||||
Set<String> keys = redisTemplate.keys("createOrder:" + userId + ":*");
|
||||
return keys != null && keys.size() > 22;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user