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

src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java

@@ -15,6 +15,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sqx.common.exception.SqxException;
 import com.sqx.common.utils.PageUtils;
+import com.sqx.common.utils.RedisUtils;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.app.dao.MsgDao;
 import com.sqx.modules.app.dao.UserDao;
@@ -57,6 +58,7 @@ import weixin.popular.bean.message.templatemessage.TemplateMessageItem;
 import weixin.popular.bean.message.templatemessage.TemplateMessageResult;
 import weixin.popular.support.TokenManager;
 
+import javax.annotation.Resource;
 import javax.websocket.SendResult;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -110,6 +112,9 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
     @Autowired
     private WuyouPay wuyouPay;
 
+    @Resource
+    private RedisUtils redisUtils;
+
     public CashOutServiceImpl(UserInfoService userInfoService) {
         this.userInfoService = userInfoService;
     }
@@ -124,7 +129,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
         } else {
             if (cashOut.getSysUserId() == null) {
                 return PageUtils.page(new PageInfo<>());
-            }else {
+            } else {
                 queryWrapper.eq(CashOut::getUserId, cashOut.getSysUserId())
                         .eq(CashOut::getUserType, 2);
             }
@@ -492,6 +497,10 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
     @Override
     @Transactional
     public Result withdraw(Long userId, Double money, String msg, boolean isSys) {
+        boolean isExist = redisUtils.hasKey(StrUtil.format("user:withdraw:interval:limit:user:{}", userId));
+        if(isExist){
+            return Result.error("提现太频繁，请稍后再试！");
+        }
         if (money == null || money <= 0.00) {
             return Result.error("请不要输入小于0的数字,请输入正确的提现金额！");
         }
@@ -632,6 +641,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
             baseMapper.insert(cashOut);
             userMoneyService.updateAmount(2, userId, money);
         }
+        redisUtils.set(StrUtil.format("user:withdraw:interval:limit:user:{}", userId), 1, 60 * 3);
         return Result.success("提现成功，将在三个工作日内到账，请耐心等待！");
     }