diff --git a/ELT.Client/Connected Services/ELTOsago/Reference.cs b/ELT.Client/Connected Services/ELTOsago/Reference.cs index 510c7d1..14a9bd7 100644 --- a/ELT.Client/Connected Services/ELTOsago/Reference.cs +++ b/ELT.Client/Connected Services/ELTOsago/Reference.cs @@ -3586,64 +3586,64 @@ namespace ELTOsago { [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=0)] - public ELTOsago.AuthInfo AuthInfo { get; set; } + public ELTOsago.AuthInfo AuthInfo; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=1)] - public string TrafficSource { get; set; } + public string TrafficSource; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=2)] - public int UW3 { get; set; } + public int UW3; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=3)] - public string InsuranceCompany { get; set; } + public string InsuranceCompany; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=4)] - public int InsurerType { get; set; } + public int InsurerType; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=5)] - public int OwnerType { get; set; } + public int OwnerType; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=6)] - public int ContractOptionId { get; set; } + public int ContractOptionId; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=7)] - public int ContractStatusId { get; set; } + public int ContractStatusId; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=8)] - public int Analytics { get; set; } + public int Analytics; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=9)] - public ELTOsago.PreviousPolicy PreviousPolicy { get; set; } + public ELTOsago.PreviousPolicy PreviousPolicy; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=10)] - public string UsagePlace { get; set; } + public string UsagePlace; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=11)] - public int TSToRegistrationPlace { get; set; } + public int TSToRegistrationPlace; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=12)] - public System.DateTime ContractBeginDate { get; set; } + public System.DateTime ContractBeginDate; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=13)] - public int Duration { get; set; } + public int Duration; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=14)] - public ELTOsago.OSAGOFullCalculationCarInfo CarInfo { get; set; } + public ELTOsago.OSAGOFullCalculationCarInfo CarInfo; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=15)] - public bool GrossViolations { get; set; } + public bool GrossViolations; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=16)] - public ELTOsago.PhysicalPerson Insurer { get; set; } + public ELTOsago.PhysicalPerson Insurer; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=17)] - public ELTOsago.PhysicalPerson Owner { get; set; } + public ELTOsago.PhysicalPerson Owner; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=18)] - public int DriversCount { get; set; } + public int DriversCount; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=19)] - public ELTOsago.FullDriver[] FullDriversInfo { get; set; } + public ELTOsago.FullDriver[] FullDriversInfo; public OSAGOFullCalculationRequest() { @@ -3763,121 +3763,121 @@ namespace ELTOsago { [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=0)] - public ELTOsago.AuthInfo AuthInfo { get; set; } + public ELTOsago.AuthInfo AuthInfo; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=1)] - public string NumCalc { get; set; } + public string NumCalc; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=2)] - public string Login { get; set; } + public string Login; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=3)] - public string TrafficSource { get; set; } + public string TrafficSource; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=4)] - public int UW3 { get; set; } + public int UW3; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=5)] - public string InsuranceCompany { get; set; } + public string InsuranceCompany; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=6)] - public int InsurerType { get; set; } + public int InsurerType; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=7)] - public int OwnerType { get; set; } + public int OwnerType; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=8)] - public int ContractOptionId { get; set; } + public int ContractOptionId; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=9)] - public int ContractStatusId { get; set; } + public int ContractStatusId; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=10)] - public string UsagePlace { get; set; } + public string UsagePlace; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=11)] - public int TSToRegistrationPlace { get; set; } + public int TSToRegistrationPlace; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=12)] - public ELTOsago.TSType TSType { get; set; } + public ELTOsago.TSType TSType; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=13)] - public bool UseWithTrailer { get; set; } + public bool UseWithTrailer; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=14)] - public double VehiclePower { get; set; } + public double VehiclePower; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=15)] - public int Duration { get; set; } + public int Duration; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=16)] - public int DriversCount { get; set; } + public int DriversCount; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=17)] - public ELTOsago.Driver[] Drivers { get; set; } + public ELTOsago.Driver[] Drivers; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=18)] - public string BonusMalus { get; set; } + public string BonusMalus; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=19)] - public string KBM { get; set; } + public string KBM; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=20)] - public bool GrossViolations { get; set; } + public bool GrossViolations; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=21)] - public string VehicleYear { get; set; } + public string VehicleYear; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=22)] - public string Mark { get; set; } + public string Mark; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=23)] - public string Model { get; set; } + public string Model; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=24)] - public ELTOsago.Modification Modification { get; set; } + public ELTOsago.Modification Modification; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=25)] - public string MarkPTS { get; set; } + public string MarkPTS; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=26)] - public string ModelPTS { get; set; } + public string ModelPTS; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=27)] - public ELTOsago.Vehicle Vehicle { get; set; } + public ELTOsago.Vehicle Vehicle; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=28)] - public ELTOsago.RegDoc RegDoc { get; set; } + public ELTOsago.RegDoc RegDoc; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=29)] - public ELTOsago.TechnicalInspection TechnicalInspection { get; set; } + public ELTOsago.TechnicalInspection TechnicalInspection; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=30)] - public int PurposeUse { get; set; } + public int PurposeUse; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=31)] - public bool IsRental { get; set; } + public bool IsRental; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=32)] - public ELTOsago.PreviousPolicy PreviousPolicy { get; set; } + public ELTOsago.PreviousPolicy PreviousPolicy; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=33)] - public ELTOsago.PhysicalPerson Insurer { get; set; } + public ELTOsago.PhysicalPerson Insurer; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=34)] - public ELTOsago.PhysicalPerson Owner { get; set; } + public ELTOsago.PhysicalPerson Owner; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=35)] - public ELTOsago.FullDriver[] FullDriversInfo { get; set; } + public ELTOsago.FullDriver[] FullDriversInfo; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=36)] - public System.DateTime ContractBegin { get; set; } + public System.DateTime ContractBegin; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=37)] - public System.DateTime ContractEnd { get; set; } + public System.DateTime ContractEnd; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=38)] - public System.DateTime ContractSign { get; set; } + public System.DateTime ContractSign; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=39)] [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] @@ -3904,13 +3904,13 @@ namespace ELTOsago public System.Nullable ThirdPeriodEnd; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=45)] - public string PolicyNumber { get; set; } + public string PolicyNumber; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=46)] - public ELTOsago.BSO BSO { get; set; } + public ELTOsago.BSO BSO; [System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://elt-poisk.com/", Order=47)] - public ELTOsago.A7 A7 { get; set; } + public ELTOsago.A7 A7; public OSAGOSaveRequest() { diff --git a/ELT.Client/Managers/Insurance/OsagoManager.cs b/ELT.Client/Managers/Insurance/OsagoManager.cs index f19871c..60bdfb6 100644 --- a/ELT.Client/Managers/Insurance/OsagoManager.cs +++ b/ELT.Client/Managers/Insurance/OsagoManager.cs @@ -45,7 +45,7 @@ namespace ELT.Client.Managers.Insurance if (string.IsNullOrEmpty(res.Error)) result.Add(companyId, res); } - catch (Exception ex) + catch (Exception) { } })); diff --git a/ELT/Controllers/InsuranceController.cs b/ELT/Controllers/InsuranceController.cs index b5bd187..965016f 100644 --- a/ELT/Controllers/InsuranceController.cs +++ b/ELT/Controllers/InsuranceController.cs @@ -4,8 +4,6 @@ using ELT.Client.Models.Insurance.Request; using ELTKasko; using ELTOsago; using Microsoft.AspNetCore.Mvc; -using Newtonsoft.Json; -using Newtonsoft.Json.Serialization; namespace ELT.Controllers { @@ -14,27 +12,25 @@ namespace ELT.Controllers public class InsuranceController : ControllerBase { [HttpPost("[action]")] - public ActionResult CalculateKasko( + public ActionResult> CalculateKasko( [FromBody] CalculateKaskoRequest calculateKaskoRequest) { var preRequestManager = new PreRequestManager(); var preRequestData = preRequestManager.GetPreRequestData(calculateKaskoRequest.Preparams); var kaskoManager = new KaskoManager(); - var res = kaskoManager.Calculate(calculateKaskoRequest, preRequestData); - return JsonConvert.SerializeObject(res, new JsonSerializerSettings()); + return kaskoManager.Calculate(calculateKaskoRequest, preRequestData); } [HttpPost("[action]")] - public ActionResult CalculateOsago( + public ActionResult> CalculateOsago( [FromBody] CalculateOsagoRequest calculateOsagoRequest) { var preRequestManager = new PreRequestManager(); var preRequestData = preRequestManager.GetPreRequestData(calculateOsagoRequest.Preparams); var osagoManager = new OsagoManager(); - var res = osagoManager.Calculate(calculateOsagoRequest, preRequestData); - return JsonConvert.SerializeObject(res, new JsonSerializerSettings()); + return osagoManager.Calculate(calculateOsagoRequest, preRequestData); } } } \ No newline at end of file