Compare commits

...

2 Commits

Author SHA1 Message Date
1c229494df Оно вошло 2024-06-01 06:32:19 +04:00
73a6b055b9 BD 2024-06-01 05:50:49 +04:00
7 changed files with 10 additions and 11 deletions

View File

@ -57,7 +57,7 @@ namespace ElectronicsShopBusinessLogic.BusinessLogic
return null;
}
_logger.LogInformation($"ReadList.Count:{list.Count}");
return null;
return list;
}

View File

@ -29,7 +29,7 @@ namespace ElectronicsShopBusinessLogic.BusinessLogic
var record = new ReportPaymeantsViewModel
{
PaymeantID=paymeant.ID,
//ProductID=paymeant.ProductID,
ClientID=paymeant.ClientID,
OrderID=paymeant.OrderID,
PayOption=paymeant.PayOption,
SumPayment=paymeant.SumPayment,

View File

@ -11,7 +11,7 @@ namespace ElectronicsShopContracts.ViewModels
{
public int PaymeantID { get; set; }
public int ProductID { get; set; }
public int ClientID { get; set; }
public int OrderID { get; set; }
public double SumPayment { get; set; }

View File

@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace ElectronicsShopDataBaseImplement.Migrations
{
[DbContext(typeof(Database))]
[Migration("20240601012156_InitMigration")]
partial class InitMigration
[Migration("20240601013228_Init")]
partial class Init
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)

View File

@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
namespace ElectronicsShopDataBaseImplement.Migrations
{
/// <inheritdoc />
public partial class InitMigration : Migration
public partial class Init : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)

View File

@ -66,11 +66,10 @@ namespace ElectronicsShopRestAPI.Controllers {
_logger.LogError(ex, "Ошибка создания оплаты");
}
}
[HttpPost]
[HttpGet]
public List<PaymeantViewModel>? GetPaymeants(int _clientID) {
try {
return _payLogic.ReadList(new PaymeantSearchModel { ClientID = _clientID });
return _payLogic?.ReadList(new PaymeantSearchModel { ClientID = _clientID });
}
catch (Exception ex) {
_logger.LogError(ex, $"Ошибка получения списка оплат клиента id = {_clientID}");

View File

@ -24,12 +24,12 @@ namespace ElectronicsShopUserApp.Controllers {
//_order = orderLogic;
_productList = new Dictionary<int, (IProductModel, int)>();
}
[HttpGet]
public IActionResult Index() {
if (APIClient.Client == null) {
return Redirect("~/Home/Enter");
}
return View(APIClient.GetRequset<List<PaymeantViewModel>>($"api/client/getpaymeants?_clientid={APIClient.Client.ID}"));
return View(APIClient.GetRequset<List<PaymeantViewModel>>($"api/Client/GetPaymeants?_clientid={APIClient.Client.ID}"));
}
[HttpGet]