Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java

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

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());

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<String> keys = redisTemplate.keys("createOrder:" + userId + ":*");
-        return keys != null && keys.size() > 12;
+        return keys != null && keys.size() > 22;
     }
 }