From 1581c3c5306487bf895d02ca7d0560a1fc15e4ce Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 26 Dec 2024 10:46:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=20=E6=8F=90=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/service/impl/UserServiceImpl.java | 14 ++++++------- .../service/impl/DiscSpinningServiceImpl.java | 8 +++---- .../pay/service/impl/CashOutServiceImpl.java | 21 +++++++++++-------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index 8a4eb39f..13bd79fb 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -1472,7 +1472,7 @@ public class UserServiceImpl extends ServiceImpl implements @Override @Transactional(rollbackFor = Exception.class) public void firstBindAwardsMoney(UserEntity entity) { - reentrantReadWriteLock.writeLock().lock(); +// reentrantReadWriteLock.writeLock().lock(); try { CommonInfo one = commonRepository.findOne(920); BigDecimal money = new BigDecimal(one.getValue()); @@ -1489,17 +1489,17 @@ public class UserServiceImpl extends ServiceImpl implements userMoneyDetails.setCreateTime(DateUtil.format(new Date(System.currentTimeMillis() - 1000), "yyyy-MM-dd HH:mm:ss")); userMoneyDetails.setMoneyType(1); boolean ret = userMoneyDetailsService.save(userMoneyDetails); - if (ret) { - ThreadUtil.execAsync(()->{ - discSpinningService.withdrawAsync(entity, money.doubleValue(), "[提现]"); - },true); - } +// if (ret) { +// ThreadUtil.execAsync(()->{ +// discSpinningService.withdrawAsync(entity, money.doubleValue(), "[提现]"); +// },true); +// } } catch (Exception e) { log.error("首绑支付宝发放奖励异常，用户信息：{}", JSONUtil.toJsonStr(entity)); log.error("首绑支付宝发放奖励异常：", e); throw new RuntimeException("首绑奖励失败"); } finally { - reentrantReadWriteLock.writeLock().unlock(); +// reentrantReadWriteLock.writeLock().unlock(); } } diff --git a/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java b/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java index fc6e2ab7..402c3517 100644 --- a/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java +++ b/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java @@ -95,10 +95,10 @@ public class DiscSpinningServiceImpl extends ServiceImpl 0 && StringUtils.isNotBlank(userInfo.getZhiFuBao()) && StringUtils.isNotBlank(userInfo.getZhiFuBaoName())) { - //提现 - withdraw(userInfo, receive.getNumber().doubleValue()); - } +// if (receive.getNumber().compareTo(new BigDecimal("0.1")) > 0 && StringUtils.isNotBlank(userInfo.getZhiFuBao()) && StringUtils.isNotBlank(userInfo.getZhiFuBaoName())) { +// //提现 +// withdraw(userInfo, receive.getNumber().doubleValue()); +// } } @Override diff --git a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java index 3bcf7dcf..dab70f33 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java @@ -1,6 +1,7 @@ package com.sqx.modules.pay.service.impl; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sqx.common.utils.PageUtils; @@ -15,6 +16,7 @@ import com.sqx.modules.app.service.UserMoneyService; import com.sqx.modules.app.service.UserService; import com.sqx.modules.common.entity.CommonInfo; import com.sqx.modules.common.service.CommonInfoService; +import com.sqx.modules.course.entity.CourseCollect; import com.sqx.modules.invite.entity.InviteMoney; import com.sqx.modules.invite.service.InviteMoneyService; import com.sqx.modules.message.dao.MessageInfoDao; @@ -427,7 +429,7 @@ public class CashOutServiceImpl extends ServiceImpl impleme alipayName = sysUserEntity.getZhiFuBaoName(); } else { UserEntity userInfo = userService.queryByUserId(userId); - if(userInfo.getStatus().equals(0)){ + if (userInfo.getStatus().equals(0)) { return Result.error(9999, "账号不存在！"); } if (StringUtils.isBlank(userInfo.getZhiFuBao()) || StringUtils.isBlank(userInfo.getZhiFuBaoName())) { @@ -482,15 +484,16 @@ public class CashOutServiceImpl extends ServiceImpl impleme if (userMoney.getAmount().doubleValue() < money) { return Result.success("可提现余额不足！"); } - BaseResp baseResp = WuyouPay.extractOrder(outOrderNo, cashOut.getMoney(), cashOut.getZhifubao(), cashOut.getZhifubaoName()); - if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))){ - userMoneyDetails.setContent("成功提现：" + money); - cashOut.setState(1); - } - if (baseResp.getErrorMsg() != null) { - return Result.error(baseResp.getErrorMsg()); - } +// BaseResp baseResp = WuyouPay.extractOrder(outOrderNo, cashOut.getMoney(), cashOut.getZhifubao(), cashOut.getZhifubaoName()); +// if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))){ +// userMoneyDetails.setContent("成功提现：" + money); +// cashOut.setState(1); +// } +// +// if (baseResp.getErrorMsg() != null) { +// return Result.error(baseResp.getErrorMsg()); +// } userMoneyDetailsService.save(userMoneyDetails); baseMapper.insert(cashOut);