shadowik/CourseWork_BankYouBankrupt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Добавление статуса "Отклонено".

Browse Source
This commit is contained in:
Programmist73 2023-05-17 20:00:17 +04:00
parent f5a129511b
commit 928137460e
7 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/AccountLogic.cs
View File

@ -79,7 +79,7 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics
//проверяем возможность операции снятия (sum может быть отрицательной) //проверяем возможность операции снятия (sum может быть отрицательной)
if (sum + account.Balance < 0) if (sum + account.Balance < 0)
{ {
throw new ArgumentNullException("Операция невозможна. Недостаточно средств", nameof(account)); return false;
} }
//обновляем балланс счёта //обновляем балланс счёта

25
BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/CashWithdrawalLogic.cs
View File

@ -71,7 +71,7 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics
return list; return list;
} }
public bool Create(CashWithdrawalBindingModel model) public bool Create(CashWithdrawalBindingModel model, bool flag)
{ {
CheckModel(model); CheckModel(model);
@ -82,12 +82,25 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics
return false; return false;
} }
_debitingStorage.Update(new DebitingBindingModel if (flag)
{ {
Id = model.DebitingId, _debitingStorage.Update(new DebitingBindingModel
DateClose = DateTime.Now, {
Status = StatusEnum.Закрыта Id = model.DebitingId,
}); DateClose = DateTime.Now,
Status = StatusEnum.Закрыта
});
}
else
{
_debitingStorage.Update(new DebitingBindingModel
{
Id = model.DebitingId,
DateClose = DateTime.Now,
Status = StatusEnum.Отклонено
});
}
return true; return true;
} }

4
BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Enter.cshtml
View File

@ -1,5 +1,5 @@
@{ @{
ViewData["Title"] = "Enter"; ViewData["Title"] = "Вход";
} }
<div class="text-center"> <div class="text-center">
@ -9,7 +9,7 @@
<div class="row"> <div class="row">
<div class="col-4">Логин:</div> <div class="col-4">Логин:</div>
<div class="col-8"> <div class="col-8">
<input type="text" name="login" / <input type="text" name="login" />
</div> </div>
</div> </div>
<div class="row"> <div class="row">

2
BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Index.cshtml
View File

@ -3,7 +3,7 @@
@model List<AccountViewModel> @model List<AccountViewModel>
@{ @{
ViewData["Title"] = "Home Page"; ViewData["Title"] = "Cписок счетов";
} }
<div class="text-center"> <div class="text-center">

2
BankYouBankrupt/BankYouBankruptContracts/BusinessLogicsContracts/ICashWithdrawalLogic.cs
View File

@ -15,7 +15,7 @@ namespace BankYouBankruptContracts.BusinessLogicsContracts
CashWithdrawalViewModel? ReadElement(CashWithdrawalSearchModel model); CashWithdrawalViewModel? ReadElement(CashWithdrawalSearchModel model);
bool Create(CashWithdrawalBindingModel model); bool Create(CashWithdrawalBindingModel model, bool flag);
bool Update(CashWithdrawalBindingModel model); bool Update(CashWithdrawalBindingModel model);

4
BankYouBankrupt/BankYouBankruptDataModels/Enums/StatusEnum.cs
View File

@ -10,6 +10,8 @@ namespace BankYouBankruptDataModels.Enums
{ {
Открыта = 0, Открыта = 0,
Закрыта = 1 Закрыта = 1,
Отклонено = 2
} }
} }

25
BankYouBankrupt/BankYouBankruptRestAPI/Controllers/AccountController.cs
View File

@ -180,12 +180,13 @@ namespace BankYouBankruptRestApi.Controllers
{ {
try try
{ {
_cashLogic.Create(CashWithdrawal);
_accountLogic.ChangeBalance(new AccountSearchModel bool flag =_accountLogic.ChangeBalance(new AccountSearchModel
{ {
Id = CashWithdrawal.AccountId Id = CashWithdrawal.AccountId
}, CashWithdrawal.Sum * -1); }, CashWithdrawal.Sum * -1);
_cashLogic.Create(CashWithdrawal, flag);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -194,7 +195,7 @@ namespace BankYouBankruptRestApi.Controllers
} }
} }
//подтверждение заявки на снятие средств со счёта //подтверждение заявки на перевод либо пополнение балланса
[HttpPost] [HttpPost]
public void CloseCrediting(MoneyTransferBindingModel moneyTransfer) public void CloseCrediting(MoneyTransferBindingModel moneyTransfer)
{ {
@ -202,19 +203,29 @@ namespace BankYouBankruptRestApi.Controllers
{ {
_moneyTransferLogic.Create(moneyTransfer); _moneyTransferLogic.Create(moneyTransfer);
bool flag = true;
//если нет отправителя, т. е. операция на перевод денег из нала в виртуал на карту //если нет отправителя, т. е. операция на перевод денег из нала в виртуал на карту
if (moneyTransfer.AccountSenderId.HasValue) if (moneyTransfer.AccountSenderId.HasValue)
{ {
_accountLogic.ChangeBalance(new AccountSearchModel flag = _accountLogic.ChangeBalance(new AccountSearchModel
{ {
Id = moneyTransfer.AccountSenderId Id = moneyTransfer.AccountSenderId
}, moneyTransfer.Sum * -1); }, moneyTransfer.Sum * -1);
} }
_accountLogic.ChangeBalance(new AccountSearchModel if (flag)
{ {
Id = moneyTransfer.AccountPayeeId _accountLogic.ChangeBalance(new AccountSearchModel
}, moneyTransfer.Sum); {
Id = moneyTransfer.AccountPayeeId
}, moneyTransfer.Sum);
}
else
{
throw new Exception("Недостаточно средств");
}
} }
catch (Exception ex) catch (Exception ex)
{ {