From 7e08b44d4d5b89b999bfcaae80ab87a0537d8b53 Mon Sep 17 00:00:00 2001 From: SamSys Date: Wed, 12 Nov 2025 13:10:57 +0330 Subject: [PATCH] fix conflict --- .../Services/SmsService.cs | 134 ++++++++---------- 1 file changed, 63 insertions(+), 71 deletions(-) diff --git a/CompanyManagment.EFCore/Services/SmsService.cs b/CompanyManagment.EFCore/Services/SmsService.cs index c6423645..6f4587d4 100644 --- a/CompanyManagment.EFCore/Services/SmsService.cs +++ b/CompanyManagment.EFCore/Services/SmsService.cs @@ -10,6 +10,7 @@ using IPE.SmsIrClient; using IPE.SmsIrClient.Models.Requests; using IPE.SmsIrClient.Models.Results; using Microsoft.Extensions.Configuration; +using SmsResult = Company.Domain.SmsResultAgg.SmsResult; namespace CompanyManagment.EFCore.Services; @@ -89,7 +90,7 @@ public class SmsService : ISmsService Thread.Sleep(2000); if (verificationSendResult.IsCompletedSuccessfully) { - + var resStartStatus = verificationSendResult.Result; var b = resStartStatus.Status; var resResult = verificationSendResult.Status; @@ -99,7 +100,7 @@ public class SmsService : ISmsService } else { - + var resStartStatus = verificationSendResult.Status; var resResult = verificationSendResult.Status; var reseExceptiont = verificationSendResult.Exception; @@ -166,10 +167,10 @@ public class SmsService : ISmsService if (checkLength > 25) fullName = fullName.Substring(0, 24); - var sendResult = VerifySendSmsAsync(number, 725814, new VerifySendParameter[] { new VerifySendParameter("FULLNAME", fullName), new VerifySendParameter("USERNAME", userName), new VerifySendParameter("PASSWORD", userName) }); - + var sendResult = VerifySendSmsAsync(number, 725814, new VerifySendParameter[] { new VerifySendParameter("FULLNAME", fullName), new VerifySendParameter("USERNAME", userName), new VerifySendParameter("PASSWORD", userName) }); - Console.WriteLine(userName + " - " + sendResult.Result.Status); + + Console.WriteLine(userName + " - " + sendResult.Result.Status); if (sendResult.IsCompletedSuccessfully) { return true; @@ -187,19 +188,19 @@ public class SmsService : ISmsService SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa"); var response = await smsIr.GetReportAsync(messId); MessageReportResult messages = response.Data; - + var appendData = new ApiResultViewModel() - { - MessageId = messages.MessageId, - LineNumber = messages.LineNumber, - Mobile = messages.Mobile, - MessageText = messages.MessageText, - SendUnixTime = UnixTimeStampToDateTime(messages.SendDateTime), - DeliveryState = DeliveryStatus(messages.DeliveryState), - DeliveryUnixTime = UnixTimeStampToDateTime(messages.DeliveryDateTime), - DeliveryColor = DeliveryColorStatus(messages.DeliveryState), - }; - return appendData; + { + MessageId = messages.MessageId, + LineNumber = messages.LineNumber, + Mobile = messages.Mobile, + MessageText = messages.MessageText, + SendUnixTime = UnixTimeStampToDateTime(messages.SendDateTime), + DeliveryState = DeliveryStatus(messages.DeliveryState), + DeliveryUnixTime = UnixTimeStampToDateTime(messages.DeliveryDateTime), + DeliveryColor = DeliveryColorStatus(messages.DeliveryState), + }; + return appendData; } public async Task> GetApiResult(string startDate, string endDate) { @@ -214,20 +215,20 @@ public class SmsService : ISmsService ed = endDate.ToGeorgianDateTime(); } var res = new List(); - Int32 unixTimestamp = (int)st.Subtract(new DateTime(1970,1,1)).TotalSeconds; + Int32 unixTimestamp = (int)st.Subtract(new DateTime(1970, 1, 1)).TotalSeconds; Int32 unixTimestamp2 = (int)ed.Subtract(new DateTime(1970, 1, 1)).TotalSeconds; - // int? fromDateUnixTime = null; // unix time - for instance: 1700598600 - //int? toDateUnixTime = null; // unix time - for instance: 1703190600 - int pageNumber = 2; - int pageSize = 100; // max: 100 - SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa"); - var response = await smsIr.GetArchivedReportAsync(pageNumber, pageSize, unixTimestamp, unixTimestamp2); - + // int? fromDateUnixTime = null; // unix time - for instance: 1700598600 + //int? toDateUnixTime = null; // unix time - for instance: 1703190600 + int pageNumber = 2; + int pageSize = 100; // max: 100 + SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa"); + var response = await smsIr.GetArchivedReportAsync(pageNumber, pageSize, unixTimestamp, unixTimestamp2); + MessageReportResult[] messages = response.Data; - foreach (var message in messages) - { - var appendData = new ApiResultViewModel() - { + foreach (var message in messages) + { + var appendData = new ApiResultViewModel() + { MessageId = message.MessageId, LineNumber = message.LineNumber, Mobile = message.Mobile, @@ -237,12 +238,12 @@ public class SmsService : ISmsService DeliveryUnixTime = UnixTimeStampToDateTime(message.DeliveryDateTime), DeliveryColor = DeliveryColorStatus(message.DeliveryState), }; - res.Add(appendData); - } + res.Add(appendData); + } + - return res; - } + } public string DeliveryStatus(byte? dv) { @@ -271,7 +272,7 @@ public class SmsService : ISmsService mess = "لیست سیاه"; break; default: - mess=""; + mess = ""; break; } @@ -346,23 +347,23 @@ public class SmsService : ISmsService { return -1; } - + } - + public async Task SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId) { - var guidStr=institutionId.ToString(); - var firstPart = guidStr.Substring(0, 15); - var secondPart = guidStr.Substring(15); - var verificationSendResult =await VerifySendSmsAsync(number, 527519, new VerifySendParameter[] + var guidStr = institutionId.ToString(); + var firstPart = guidStr.Substring(0, 15); + var secondPart = guidStr.Substring(15); + var verificationSendResult = await VerifySendSmsAsync(number, 527519, new VerifySendParameter[] { new("FULLNAME", fullName), new("CODE1",firstPart), new("CODE2",secondPart) }); - - var smsResult = new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message, "لینک تاییدیه ایجاد قرارداد مالی", - fullName, number, contractingPartyId, institutionContractId); + + var smsResult = new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message, "لینک تاییدیه ایجاد قرارداد مالی", + fullName, number, contractingPartyId, institutionContractId); await _smsResultRepository.CreateAsync(smsResult); await _smsResultRepository.SaveChangesAsync(); return verificationSendResult.Status == 0; @@ -371,49 +372,40 @@ public class SmsService : ISmsService public async Task SendInstitutionAmendmentVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId) { - var guidStr=institutionId.ToString(); + var guidStr = institutionId.ToString(); var firstPart = guidStr.Substring(0, 15); var secondPart = guidStr.Substring(15); - var verificationSendResult =await VerifySendSmsAsync(number, 527519, new VerifySendParameter[] + var verificationSendResult = await VerifySendSmsAsync(number, 527519, new VerifySendParameter[] { new("FULLNAME", fullName), new("CODE1",firstPart), new("CODE2",secondPart) }); - var smsResult = new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message, "لینک تاییدیه ارتقا قرارداد مالی", + var smsResult = new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message, "لینک تاییدیه ارتقا قرارداد مالی", fullName, number, contractingPartyId, institutionContractId); await _smsResultRepository.CreateAsync(smsResult); await _smsResultRepository.SaveChangesAsync(); return verificationSendResult.Status == 0; } - public SmsResult TaskReminderSms(string number, string taskCount) + public async Task SendInstitutionVerificationCode(string number, string code, string contractingPartyFullName, + long contractingPartyId, long institutionContractId) { - var tamplateId = 909433; - var result = new SmsResult(); - var smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa"); - var sendResult = smsIr.VerifySendAsync(number, tamplateId, - new VerifySendParameter[] - { - new("TASKCOUNT", taskCount), - }); - Thread.Sleep(500); - - - if (sendResult.IsCompletedSuccessfully) + var verificationSendResult = await VerifySendSmsAsync(number, 965348, new VerifySendParameter[] { - var status = sendResult.Result.Status; - var message = sendResult.Result.Message; - var messaeId = sendResult.Result.Data.MessageId; - return result.Succedded(status, message, messaeId); - } - else - { - var status = sendResult.Result.Status; - var message = sendResult.Result.Message; - var messaeId = sendResult.Result.Data.MessageId; - return result.Failed(status, message, messaeId); - } + new("VERIFYCODE", code) + }); + + var smsResult = new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message, "کد تاییدیه قرارداد مالی", + contractingPartyFullName, number, contractingPartyId, institutionContractId); + await _smsResultRepository.CreateAsync(smsResult); + await _smsResultRepository.SaveChangesAsync(); + return verificationSendResult.Status == 0; + } + + public _0_Framework.Application.Sms.SmsResult TaskReminderSms(string number, string taskCount) + { + throw new NotImplementedException(); } #endregion