1

zj

5 days ago 03fe4dca7008ea95b60058740e880f31fe5be6dd

 src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java

@@ -18,6 +18,7 @@
import com.nq.pojo.UserRecharge;
import com.nq.utils.DateTimeUtil;
import com.nq.utils.KeyUtils;
import com.nq.utils.UserFundUtil;
import com.nq.utils.redis.RedisShardedPoolUtils;

import java.math.BigDecimal;
@@ -149,7 +150,10 @@
        if (StringUtils.isBlank(amt) || StringUtils.isBlank(payType)) {
            return ServerResponse.createByErrorMsg("参数不能为空");
        }
        User user= (User) iUserService.findByUserId(uid).getData();
        User user = iUserService.getUserEntityById(uid);
        if (user == null) {
            return ServerResponse.createByErrorMsg("用户不存在");
        }

        UserRecharge userRecharge = new UserRecharge();

@@ -205,10 +209,8 @@
        if (user == null) {
            return ServerResponse.createByErrorMsg("用户不存在");
        }
        BigDecimal userAmt_before = user.getUserAmt();
        BigDecimal enableAmt_before = user.getEnableAmt();
        user.setUserAmt(userAmt_before.add(userRecharge.getPayAmt()));
        user.setEnableAmt(enableAmt_before.add(userRecharge.getPayAmt()));
        BigDecimal payAmt = userRecharge.getPayAmt();
        UserFundUtil.creditUserBalance(user, payAmt);
        int updateCount = this.userMapper.updateByPrimaryKeySelective(user);
        if (updateCount > 0) {
            log.info("1.修改用户资金成功");
@@ -234,8 +236,8 @@
        ucd.setUserName(user.getRealName());
        ucd.setDeType("用户充值");
        ucd.setDeAmt(userRecharge.getPayAmt());
        ucd.setDeSummary("用户充值成功，充值前总金额:" + userAmt_before + ",充值后总金额:" + user.getUserAmt() + ",充值前可用:" + enableAmt_before + ",充值后可用:" + user
                .getEnableAmt());
        ucd.setDeSummary("用户充值成功，充值前总金额:" + user.getUserAmt().subtract(payAmt) + ",充值后总金额:" + user.getUserAmt() + ",充值前可用:" + user.getEnableAmt().subtract(payAmt) + ",充值后可用:" + user
                .getEnableAmt() + ",充值后可取:" + user.getEnaleWithdrawAmt());

        ucd.setAddTime(new Date());
        ucd.setIsRead(Integer.valueOf(0));
@@ -361,12 +363,9 @@
            if (user == null) {
                return ServerResponse.createByErrorMsg("用户不存在");
            }
            BigDecimal user_amt = user.getUserAmt().add(userRecharge.getPayAmt());
            log.info("管理员确认订单成功，增加用户 {} 总资金，原金额 = {} , 增加后 = {}", new Object[]{user.getId(), user.getUserAmt(), user_amt});
            user.setUserAmt(user_amt);
            BigDecimal user_enable_amt = user.getEnableAmt().add(userRecharge.getPayAmt());
            log.info("管理员确认订单成功，增加用户 {} 可用资金，原金额 = {} , 增加后 = {}", new Object[]{user.getId(), user.getEnableAmt(), user_enable_amt});
            user.setEnableAmt(user_enable_amt);
            UserFundUtil.creditUserBalance(user, userRecharge.getPayAmt());
            log.info("管理员确认订单成功，用户 {} 总资金={} 可用={} 可取={}",
                    user.getId(), user.getUserAmt(), user.getEnableAmt(), user.getEnaleWithdrawAmt());

            int updateCount = this.userMapper.updateByPrimaryKeySelective(user);
            if (updateCount > 0) {
@@ -420,9 +419,7 @@
            userRecharge.setPayChannel("2");
            userRecharge.setOrderStatus(Integer.valueOf(1));

            user.setUserAmt(user.getUserAmt().add(new BigDecimal(amt.intValue())));
            user.setEnableAmt(user.getEnableAmt().add(new BigDecimal(amt.intValue())));
            user.setEnaleWithdrawAmt(user.getEnaleWithdrawAmt().add(new BigDecimal(amt.intValue())));
            UserFundUtil.creditUserBalance(user, new BigDecimal(amt.intValue()));
            this.userMapper.updateByPrimaryKeySelective(user);
        } else if (state.intValue() == 2) {
            userRecharge.setOrderStatus(Integer.valueOf(2));