|
|
@@ -483,7 +483,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
|
|
}
|
|
|
}
|
|
|
//查询账户的余额
|
|
|
- BigDecimal myMoneys = BigDecimal.ZERO;
|
|
|
+ BigDecimal myMoneys;
|
|
|
UserEntity userEntity = userService.selectUserById(userId);
|
|
|
if (type == 1) {
|
|
|
myMoneys=userEntity.getBalance();
|
|
|
@@ -491,8 +491,9 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
|
|
UserMoney userMoney = userMoneyDao.selectMoney(userId);
|
|
|
myMoneys = userMoney.getMoney();
|
|
|
}
|
|
|
- //扣除金额
|
|
|
- Double moneySum = AmountCalUtils.add(new BigDecimal(money), new BigDecimal(mul)).doubleValue(); //金额=提现金额+手续费
|
|
|
+ // 扣除金额=提现金额+手续费
|
|
|
+ BigDecimal deductibleAmount = AmountCalUtils.add(new BigDecimal(money), new BigDecimal(mul));
|
|
|
+ Double moneySum = deductibleAmount.doubleValue();
|
|
|
if (myMoneys.doubleValue() >= moneySum) { //用户金额足够
|
|
|
//扣除可提现金额直接在数据库进行操作
|
|
|
//增加金额操作记录
|
|
|
@@ -537,6 +538,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
|
|
cashOut.setCreateAt(sdf.format(new Date()));
|
|
|
cashOut.setUserId(userId);
|
|
|
cashOut.setRate(mul);
|
|
|
+ cashOut.setCurrentBalance(AmountCalUtils.sub(myMoneys, deductibleAmount).doubleValue());
|
|
|
cashOut.setShopId(shopId);
|
|
|
cashOut.setOrderNumber(String.valueOf(System.currentTimeMillis()));
|
|
|
cashOut.setClassify(classify);
|
|
|
@@ -547,7 +549,6 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
|
|
} else {
|
|
|
return Result.error("金额不足,请输入正确的金额!");
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
@Override
|