Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
墨大叔 2024-08-07 10:19:31 +08:00
commit ed4da3954e

View File

@ -391,6 +391,7 @@ public class TransactionBillServiceImpl implements TransactionBillService {
bill.setChannelId(channel.getChannelId()); bill.setChannelId(channel.getChannelId());
bill.setWithdrawType(WithdrawType.ONLINE.getType()); bill.setWithdrawType(WithdrawType.ONLINE.getType());
bill.setChannelCost(channel.getCostRate().multiply(bill.getMoney()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP)); // 渠道成本 bill.setChannelCost(channel.getCostRate().multiply(bill.getMoney()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP)); // 渠道成本
bill.setAfterBalance(user.getBalance().subtract(dto.getMoney())); // 剩余金额
transactionTemplate.execute(status -> { transactionTemplate.execute(status -> {
// 减少余额后的用户信息 // 减少余额后的用户信息