Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
@@ -15,6 +15,7 @@ import com.github.pagehelper.PageHelper;
|
|||||||
import com.github.pagehelper.PageInfo;
|
import com.github.pagehelper.PageInfo;
|
||||||
import com.sqx.common.exception.SqxException;
|
import com.sqx.common.exception.SqxException;
|
||||||
import com.sqx.common.utils.PageUtils;
|
import com.sqx.common.utils.PageUtils;
|
||||||
|
import com.sqx.common.utils.RedisUtils;
|
||||||
import com.sqx.common.utils.Result;
|
import com.sqx.common.utils.Result;
|
||||||
import com.sqx.modules.app.dao.MsgDao;
|
import com.sqx.modules.app.dao.MsgDao;
|
||||||
import com.sqx.modules.app.dao.UserDao;
|
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.bean.message.templatemessage.TemplateMessageResult;
|
||||||
import weixin.popular.support.TokenManager;
|
import weixin.popular.support.TokenManager;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
import javax.websocket.SendResult;
|
import javax.websocket.SendResult;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
@@ -110,6 +112,9 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
|||||||
@Autowired
|
@Autowired
|
||||||
private WuyouPay wuyouPay;
|
private WuyouPay wuyouPay;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private RedisUtils redisUtils;
|
||||||
|
|
||||||
public CashOutServiceImpl(UserInfoService userInfoService) {
|
public CashOutServiceImpl(UserInfoService userInfoService) {
|
||||||
this.userInfoService = userInfoService;
|
this.userInfoService = userInfoService;
|
||||||
}
|
}
|
||||||
@@ -492,6 +497,10 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
|||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public Result withdraw(Long userId, Double money, String msg, boolean isSys) {
|
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) {
|
if (money == null || money <= 0.00) {
|
||||||
return Result.error("请不要输入小于0的数字,请输入正确的提现金额!");
|
return Result.error("请不要输入小于0的数字,请输入正确的提现金额!");
|
||||||
}
|
}
|
||||||
@@ -632,6 +641,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
|||||||
baseMapper.insert(cashOut);
|
baseMapper.insert(cashOut);
|
||||||
userMoneyService.updateAmount(2, userId, money);
|
userMoneyService.updateAmount(2, userId, money);
|
||||||
}
|
}
|
||||||
|
redisUtils.set(StrUtil.format("user:withdraw:interval:limit:user:{}", userId), 1, 60 * 3);
|
||||||
return Result.success("提现成功,将在三个工作日内到账,请耐心等待!");
|
return Result.success("提现成功,将在三个工作日内到账,请耐心等待!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user