【CHG】还款逻辑调整

This commit is contained in:
limqhz
2023-02-28 17:56:16 +08:00
parent 713557f70b
commit a631f03399

View File

@@ -206,13 +206,19 @@ public class WxBillController extends BaseWxController{
private double modifyBalance(boolean isBack,AccBill accBill){ private double modifyBalance(boolean isBack,AccBill accBill){
AccBillType billType = accBill.getBillType(); AccBillType billType = accBill.getBillType();
double money = isBack ? - accBill.getMoney() : accBill.getMoney(); double money = isBack ? - accBill.getMoney() : accBill.getMoney();
accSettingService.updateBalance(accBill.getAccount(),AccBillType.EXPEND.equals(billType) ? -money : money); AccSetting byId = accSettingService.getById(accBill.getAccount());
AccSettingType settingType = byId.getSettingType();
boolean isOwe = false;
if (AccSettingType.OWE_SETTING.equals(settingType)){
isOwe = true;
}
accSettingService.updateBalance(accBill.getAccount(),AccBillType.EXPEND.equals(billType) && !isOwe ? -money : money);
if (AccBillType.REPAYMENT.equals(billType) || AccBillType.TRANSFER.equals(billType)){ if (AccBillType.REPAYMENT.equals(billType) || AccBillType.TRANSFER.equals(billType)){
accSettingService.updateBalance(accBill.getFromAccount(),-money); accSettingService.updateBalance(accBill.getFromAccount(),-money);
} }
if (AccBillType.INCOME.equals(billType) || AccBillType.EXPEND.equals(billType)){ if (AccBillType.INCOME.equals(billType) || AccBillType.EXPEND.equals(billType)){
AccSetting byId = accSettingService.getById(accBill.getAccount()); AccSetting after = accSettingService.getById(accBill.getAccount());
return byId.getBalance(); return after.getBalance();
} }
return 0; return 0;
} }