From bd32eeaad107361ab2bce3d07bd85b1baf0d3978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Mon, 13 May 2024 14:16:53 +0800 Subject: [PATCH] 123 --- .../com/ruoyi/cai/service/impl/AccountServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java index 9d8de1b0..ae885d2a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java @@ -356,7 +356,7 @@ public class AccountServiceImpl extends ServiceImpl impl }else { if(roomData.getPayIncome() > (diff - roomData.getPayCoin())){ // 消费金额不够退，但是收益金额扣扣费 incsCoin = roomData.getPayCoin(); - incsIncomeCoin = roomData.getPayIncome() - (diff - roomData.getPayCoin()); + incsIncomeCoin = diff - roomData.getPayCoin(); } else { // 消费金额不够退 余额也不够退 能退多少是多少 incsCoin = roomData.getPayCoin(); incsIncomeCoin = roomData.getPayIncome(); @@ -420,10 +420,10 @@ public class AccountServiceImpl extends ServiceImpl impl public static void main(String[] args) { long incsCoin = 0L; // 需要退的金额 long incsIncomeCoin = 0L; // 需要退的收益金额 - int diff = 40; + int diff = 0; RoomData roomData = new RoomData(); roomData.setPayCoin(100); - roomData.setPayIncome(0); + roomData.setPayIncome(100); Long payCoin = Long.valueOf(roomData.getPayCoin()); // 已经支付的余额 Long payIncome = Long.valueOf(roomData.getPayIncome()); // 已经支付的收益 if(roomData.getPayCoin() > diff){ // 消费的金额大于待退款金额 @@ -431,7 +431,7 @@ public class AccountServiceImpl extends ServiceImpl impl }else { if(roomData.getPayIncome() > (diff - roomData.getPayCoin())){ // 消费金额不够退，但是收益金额扣扣费 incsCoin = roomData.getPayCoin(); - incsIncomeCoin = roomData.getPayIncome() - (diff - roomData.getPayCoin()); + incsIncomeCoin = diff - roomData.getPayCoin(); } else { // 消费金额不够退 余额也不够退 能退多少是多少 incsCoin = roomData.getPayCoin(); incsIncomeCoin = roomData.getPayIncome();