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

smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java

@@ -391,6 +391,7 @@ public class TransactionBillServiceImpl implements TransactionBillService {
             bill.setChannelId(channel.getChannelId());
             bill.setWithdrawType(WithdrawType.ONLINE.getType());
             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 -> {
                 // 减少余额后的用户信息