diff --git a/CompanyManagment.Application/SmsSettingApplication.cs b/CompanyManagment.Application/SmsSettingApplication.cs index 6b1d5651..6623c6a4 100644 --- a/CompanyManagment.Application/SmsSettingApplication.cs +++ b/CompanyManagment.Application/SmsSettingApplication.cs @@ -136,12 +136,12 @@ public class SmsSettingApplication : ISmsSettingApplication public async Task InstantSendReminderSms(List command) { var op = new OperationResult(); - if (_hostEnvironment.IsDevelopment()) - { + //if (_hostEnvironment.IsDevelopment()) + //{ - return op.Failed(" در محیط توسعه امکان ارسال وجود ندارد "); + // return op.Failed(" در محیط توسعه امکان ارسال وجود ندارد "); - } + //} string typeOfSms = "یادآور بدهی ماهانه"; string sendMessStart = "شروع یادآور آنی"; string sendMessEnd = "پایان یادآور آنی"; @@ -289,16 +289,16 @@ public class SmsSettingApplication : ISmsSettingApplication { var op = new OperationResult(); - if (_hostEnvironment.IsDevelopment()) - { - var str = ""; - foreach (var item in phoneNumbers) - { - str += $" {item}, "; - } - return op.Failed(" در محیط توسعه امکان ارسال وجود ندارد " + " لیست ارسال شما " + str); + //if (_hostEnvironment.IsDevelopment()) + //{ + // var str = ""; + // foreach (var item in phoneNumbers) + // { + // str += $" {item}, "; + // } + // return op.Failed(" در محیط توسعه امکان ارسال وجود ندارد " + " لیست ارسال شما " + str); - } + //} if (typeOfSmsSetting == TypeOfSmsSetting.InstitutionContractDebtReminder) { if (phoneNumbers.Any()) diff --git a/CompanyManagment.EFCore/Repository/InstitutionContractSmsServiceRepository.cs b/CompanyManagment.EFCore/Repository/InstitutionContractSmsServiceRepository.cs index fa3e9d70..e2254f10 100644 --- a/CompanyManagment.EFCore/Repository/InstitutionContractSmsServiceRepository.cs +++ b/CompanyManagment.EFCore/Repository/InstitutionContractSmsServiceRepository.cs @@ -2108,61 +2108,78 @@ public class InstitutionContractSmsServiceRepository : RepositoryBase 18 ? item.PartyName.Substring(0, 18) : item.PartyName; - string errMess = $"{name}-خطا"; - _logger.LogError(errMess); - await _smsService.Alarm("09114221321", errMess); - } - - var percent = (successProcess / (double)countList) * 100; + var percent = (successProcess / (double)100) * 100; await _hubContext.Clients.Group(SendSmsHub.GetGroupName(7)) .SendAsync("showStatus", (int)percent); - + if (i == 5) + { + await _hubContext.Clients.Group(SendSmsHub.GetGroupName(7)) + .SendAsync("error", "خطا در شماره 5"); + } + if (i == 10) + { + await _hubContext.Clients.Group(SendSmsHub.GetGroupName(7)) + .SendAsync("error", "خطا در شماره 10"); + } successProcess += 1; + Thread.Sleep(600); } + //foreach (var item in smsListData) + //{ + // try + // { + + // if (item.TypeOfSmsMethod == "MonthlyBill") + // { + // var res = await _smsService.MonthlyBill(item.PhoneNumber, item.TemplateId, item.PartyName, + // item.Amount, + // $"{item.ContractingPartyId}", item.AproveId); + + // if (res.isSucceded) + // { + // var createSmsResult = new Company.Domain.SmsResultAgg.SmsResult(res.messaeId, + // res.message, typeOfSms, item.PartyName, item.PhoneNumber, + // item.ContractingPartyId, item.InstitutionContractId); + + // await _smsResultRepository.CreateAsync(createSmsResult); + // await _smsResultRepository.SaveChangesAsync(); + // } + // } + // else + // { + // var res = await _smsService.MonthlyBillNew(item.PhoneNumber, item.TemplateId, item.PartyName, + // item.Amount, item.Code1, item.Code2); + // if (res.isSucceded) + // { + // var createSmsResult = new Company.Domain.SmsResultAgg.SmsResult(res.messaeId, + // res.message, typeOfSms, item.PartyName, item.PhoneNumber, + // item.ContractingPartyId, item.InstitutionContractId); + + // await _smsResultRepository.CreateAsync(createSmsResult); + // await _smsResultRepository.SaveChangesAsync(); + // } + // } + + // Thread.Sleep(600); + // } + // catch (Exception e) + // { + // string name = item.PartyName.Length > 18 ? item.PartyName.Substring(0, 18) : item.PartyName; + // string errMess = $"{name}-خطا"; + // _logger.LogError(errMess); + // await _smsService.Alarm("09114221321", errMess); + // } + + // var percent = (successProcess / (double)countList) * 100; + // await _hubContext.Clients.Group(SendSmsHub.GetGroupName(7)) + // .SendAsync("showStatus", (int)percent); + + // successProcess += 1; + //} + //await _smsService.Alarm("09114221321", sendMessEnd); //Thread.Sleep(1000);