From 15eb82df2d6ec539e9d4245bfe08d531e8eb6379 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期日, 27 四月 2025 14:33:26 +0800
Subject: [PATCH] 修改培训订单占多个座位

---
 zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs | 2159 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 1,367 insertions(+), 792 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
index dd4d546..9aee6f5 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
@@ -35,6 +35,7 @@
         private readonly zhengcaioaContext _context;
         private readonly IMapper _mapper;
         private readonly zcUserInfoN_dbContext _zcUserInfoN_DbContext;
+        private readonly IMdbtestContext _iMdbtestContext;
         public TimerGetShopUsersService(ILogger<TimerGetShopUsersService> logger, IServiceScopeFactory factory)
         {
             _logger = logger;
@@ -46,6 +47,7 @@
             _context = factory.CreateScope().ServiceProvider.GetRequiredService<zhengcaioaContext>();
             _mapper = factory.CreateScope().ServiceProvider.GetRequiredService<IMapper>();
             _zcUserInfoN_DbContext = factory.CreateScope().ServiceProvider.GetRequiredService<zcUserInfoN_dbContext>();
+            _iMdbtestContext = factory.CreateScope().ServiceProvider.GetRequiredService<IMdbtestContext>();
         }
 
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
@@ -55,17 +57,20 @@
             //stoppingToken.Register(() => File.Create($"E:\\dotnetCore\\Practice\\Practice\\{DateTime.Now.Millisecond}.txt"));
 
             DateTime datenow = DateTime.Now;
-            DateTime datenowfasongxiaoxi = DateTime.Now;
+            DateTime datenowfasongxiaoxi = DateTime.Now.Date;
             while (!stoppingToken.IsCancellationRequested)
             {
                 _logger.LogInformation("TimerGetShopUsersService 寮�濮嬫墽琛�");
                 _logger.LogInformation(datenow.ToString("yyyy-MM-dd HH:mm:ss"));
-                if (datenowfasongxiaoxi.Day == DateTime.Now.Day && DateTime.Now.Hour == 20)
+                _logger.LogInformation("datenowfasongxiaoxi.Day锛�" + datenowfasongxiaoxi.ToString("yyyy-MM-dd HH:mm:ss"));
+                _logger.LogInformation("DateTime.Now.Hour锛�" + DateTime.Now.Hour);
+                if (datenowfasongxiaoxi <= DateTime.Now.Date && DateTime.Now.Hour == 11)
                 //if (true)
                 {
-
+                    _logger.LogInformation("datenowfasongxiaoxi.Day" + datenowfasongxiaoxi.ToString("yyyy-MM-dd HH:mm:ss"));
                     try
                     {
+                        datenowfasongxiaoxi = DateTime.Now.Date.AddDays(1);
                         this.fasongxiaoxi();
 
                     }
@@ -73,7 +78,6 @@
                     {
                         _logger.LogInformation(ex.ToString());
                     }
-                    datenowfasongxiaoxi.AddDays(1);
                 }
 
                 //姣忎釜灏忔椂璁＄畻涓�娆�
@@ -112,6 +116,11 @@
         //鏌ヨ骞朵笖鍙戦�佺煭淇″拰app娑堟伅缁欏鎴�
         public void fasongxiaoxi()
         {
+            string appkey = "BC-3ed0636563ff4f0f96d6fab0c150e940";
+            string huawei = "IM";
+            string oppo = "IM";
+            string xiaomi = "IM";
+            string vivo = "1";
             var startdate = DateTime.Now.AddMonths(-3);
 
             var projects   =_context.Projects.Where(x => x.RecStatus == "A" && x.StartTime >= startdate).ToList();
@@ -143,6 +152,9 @@
 
             //浼氬憳琛�
             var frameworkUsers = _zcUserInfoN_DbContext.FrameworkUsers.Where(x => x.IsValid == true).ToList();
+
+            //鏄电О鏍�   
+            var imUserInfos = _iMdbtestContext.ImUserInfos.ToList();
 
             //StringBuilder number = new StringBuilder(); ;
             //if (result != null && result.Count > 0)
@@ -528,10 +540,10 @@
                             projectfasongxiaoxiDTO1.Ywjl = cooperatecustomCustomer.Ywjl;
                             projectfasongxiaoxiDTO1.KhId = cooperatecustomCustomer.Id;
                             projectfasongxiaoxiDTO1.HuiyuanId = cooperatecustomCustomer.HuiyuanId;
-                            projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
+                            //projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
 
                             //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛�
-                            var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id && x.Huiyuanid != cooperatecustomCustomer.HuiyuanId).ToList();
+                            var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id ).ToList();
                             if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0)
                             {
                                 var huiyuanids = new List<Guid>();
@@ -558,6 +570,24 @@
                                         projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
                                         projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
                                         projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+                                        string name = "";
+                                        var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+                                        if (imUserInfo != null)
+                                        {
+                                            name = imUserInfo.NickName;
+                                        }
+                                        else
+                                        {
+                                            if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+                                            {
+                                                name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+                                            }
+                                            else
+                                            {
+                                                name = frameworkUser.Name;
+                                            }
+                                        }
+                                        projectfasongxiaoxiDTO.HuiyuanName = name;
                                         projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
                                     }
                                 }
@@ -577,10 +607,10 @@
                         projectfasongxiaoxiDTO1.Ywjl = intentionCustomer.Ywjl;
                         projectfasongxiaoxiDTO1.KhId = intentionCustomer.Id;
                         projectfasongxiaoxiDTO1.HuiyuanId = intentionCustomer.HuiyuanId;
-                        projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
+                        //projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
 
                         //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛�
-                        var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id && x.Huiyuanid != intentionCustomer.HuiyuanId).ToList();
+                        var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id ).ToList();
                         if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0)
                         {
                             var huiyuanids = new List<Guid>();
@@ -607,179 +637,30 @@
                                     projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
                                     projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
                                     projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+                                    string name = "";
+                                    var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+                                    if (imUserInfo != null)
+                                    {
+                                        name = imUserInfo.NickName;
+                                    }
+                                    else
+                                    {
+                                        if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+                                        {
+                                            name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+                                        }
+                                        else
+                                        {
+                                            name = frameworkUser.Name;
+                                        }
+                                    }
+                                    projectfasongxiaoxiDTO.HuiyuanName = name;
                                     projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
                                 }
                             }
                         }
                     }
                 }
-
-
-                //鎺ㄩ�丄pp
-                foreach (var ywjl in Ywjl)
-                {
-
-                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList();
-                    int j = 0;
-                    while (j * 1000 <= projectfasongxiaoxisywjl.Count)
-                    {
-                        j = j + 1;
-                        string numberstring = "";
-                        string customename = "";
-                        if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
-                        {
-                            int countt = (j * 1000);
-                            if (countt > projectfasongxiaoxisywjl.Count)
-                            {
-                                countt = projectfasongxiaoxisywjl.Count;
-                            }
-
-                            for (int i = 0; i < countt; i++)
-                            {
-                                if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
-                                {
-                                    continue;
-                                }
-                                numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
-                                customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
-
-                            }
-                        }
-
-                        if (numberstring.EndsWith(","))
-                        {
-                            numberstring = numberstring.Substring(0, numberstring.Length - 1);
-                        }
-                        if (string.IsNullOrEmpty(numberstring))
-                        {
-                            continue;
-                        }
-                        string conment = "{"
-                            + "\"title\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔","
-                            + "\"content\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
-                              + "\"getui_alias\": [" + numberstring + "],"
-                                + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"},"
-                                    + "\"force_notification\": true"
-                                    + "}";
-
-                        string result2 = SMSHelper.PushApp(conment);
-                        _logger.LogInformation("result2:" + result2);
-                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
-
-                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
-                        {
-                            var isOK = jobjectresult["isOK"].ToString();
-
-                            foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                            {
-                                if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
-                                {
-                                    var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                    projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                    projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
-                                    projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
-                                    projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
-                                    projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
-                                    projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
-                                    projectfasongxiaoxi.RecStatus = "A";
-                                    projectfasongxiaoxi.Createtime = DateTime.Now;
-                                    _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
-                                }
-                            }
-                            _context.SaveChanges();
-                        }
-
-
-
-                        _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename);
-                    }
-
-
-
-
-                }
-                //涓氬姟缁忕悊涓虹┖
-                if (true)
-                {
-                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
-                    int j = 0;
-                    while (j * 1000 <= projectfasongxiaoxisywjl.Count)
-                    {
-                        j = j + 1;
-                        string numberstring = "";
-                        string customename = "";
-                        if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
-                        {
-                            int countt = (j * 1000);
-                            if (countt > projectfasongxiaoxisywjl.Count)
-                            {
-                                countt = projectfasongxiaoxisywjl.Count;
-                            }
-                            for (int i = 0; i < countt; i++)
-                            {
-                                if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
-                                {
-                                    continue;
-                                }
-                                numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
-                                customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
-
-                            }
-                        }
-
-                        if (numberstring.EndsWith(","))
-                        {
-                            numberstring = numberstring.Substring(0, numberstring.Length - 1);
-                        }
-                        if (string.IsNullOrEmpty(numberstring))
-                        {
-                            continue;
-                        }
-                        string conment = "{"
-                            + "\"title\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔","
-                            + "\"content\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�400-028-8080 \","
-                              + "\"getui_alias\": [" + numberstring + "],"
-                                + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�400-028-8080 \"},"
-                                    + "\"force_notification\": true"
-                                    + "}";
-
-                        string result2 = SMSHelper.PushApp(conment);
-                        _logger.LogInformation("result2:" + result2);
-                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
-
-                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
-                        {
-                            var isOK = jobjectresult["isOK"].ToString();
-
-                            foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                            {
-                                if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
-                                {
-                                    var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                    projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                    projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
-                                    projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
-                                    projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
-                                    projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
-                                    projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
-                                    projectfasongxiaoxi.RecStatus = "A";
-                                    projectfasongxiaoxi.Createtime = DateTime.Now;
-                                    _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
-                                }
-                            }
-                            _context.SaveChanges();
-                        }
-
-
-
-                        _logger.LogInformation("鏃犱笟鍔＄粡鐞嗘帹閫乤pp缁欏鎴�" + customename);
-                    }
-
-
-
-                }
-
-
 
                 //鍙戦�佺煭淇�
                 foreach (var ywjl in Ywjl)
@@ -788,7 +669,7 @@
                     if (projectfasongxiaoxisywjl.Count >= 100)
                     {
                         int j = 0;
-                        while (j*1000<= projectfasongxiaoxisywjl.Count)
+                        while (j * 1000 <= projectfasongxiaoxisywjl.Count)
                         {
                             j = j + 1;
                             string numberstring = "";
@@ -796,14 +677,14 @@
                             if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
                             {
                                 int countt = (j * 1000);
-                                if(countt> projectfasongxiaoxisywjl.Count)
+                                if (countt > projectfasongxiaoxisywjl.Count)
                                 {
                                     countt = projectfasongxiaoxisywjl.Count;
                                 }
 
                                 for (int i = 0; i < countt; i++)
                                 {
-                                    if (numberstring.IndexOf(projectfasongxiaoxisywjl[i+j-1].Tel) >= 0)
+                                    if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
                                     {
                                         continue;
                                     }
@@ -843,7 +724,7 @@
                             }
                         }
 
-                       
+
 
 
 
@@ -912,13 +793,255 @@
                         }
 
 
-                           
+
 
                     }
                 }
 
+                //鎺ㄩ�丄pp
+                foreach (var ywjl in Ywjl)
+                {
+                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id).ToList();
+                    for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++)
+                    {
+                        string conment = "{"
+                             + "\"appkey\": \"" + appkey + "\","
+                              + "\"senderId\": \"" + ywjl.UserSn + "\","
+                                 + "\"senderData\": { \"avatar\": \"\",\"name\": \""+ ywjl.UserName + "\"},"
+                                   + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \""+ projectfasongxiaoxisywjl[i].HuiyuanName+ "\"}},"
+                                    + "\"type\": \"text\","
+                                     + "\"payload\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+                                       + "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔� \",\"body\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔� \","
+                                       + "\"vendorOptions\": {\"huawei\": {\"category\": \"" + huawei + "\"},\"oppo\": {\"channel_id\": \"" + oppo + "\"},\"xiaomi\": {\"channel_id\": \"" + xiaomi + "\"},\"vivo\": {\"classification\":"+ vivo + "}}"
+                                       + "}"
+                            + "}";
 
-                
+                        string result2 = SMSHelper.PushAppduandu(conment);
+                        _logger.LogInformation("result2:" + result2);
+                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "200")
+                        {
+                            var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                            projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                            projectfasongxiaoxi.ProjectId = projectfasongxiaoxisywjl[i].ProjectId;
+                            projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId;
+                            projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing;
+                            projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei;
+                            projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl;
+                            projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname;
+                            projectfasongxiaoxi.RecStatus = "A";
+                            projectfasongxiaoxi.Createtime = DateTime.Now;
+                            _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+
+                        }
+                        _context.SaveChanges();
+                        _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname);
+
+                    }
+
+
+                    //var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList();
+                    //int j = 0;
+                    //while (j * 1000 <= projectfasongxiaoxisywjl.Count)
+                    //{
+                    //    j = j + 1;
+                    //    string numberstring = "";
+                    //    string customename = "";
+                    //    if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
+                    //    {
+                    //        int countt = (j * 1000);
+                    //        if (countt > projectfasongxiaoxisywjl.Count)
+                    //        {
+                    //            countt = projectfasongxiaoxisywjl.Count;
+                    //        }
+
+                    //        for (int i = 0; i < countt; i++)
+                    //        {
+                    //            if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
+                    //            {
+                    //                continue;
+                    //            }
+                    //            numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
+                    //            customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
+
+                    //        }
+                    //    }
+
+                    //    if (numberstring.EndsWith(","))
+                    //    {
+                    //        numberstring = numberstring.Substring(0, numberstring.Length - 1);
+                    //    }
+                    //    if (string.IsNullOrEmpty(numberstring))
+                    //    {
+                    //        continue;
+                    //    }
+                    //    string conment = "{"
+                    //        + "\"title\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔","
+                    //        + "\"content\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+                    //          + "\"getui_alias\": [" + numberstring + "],"
+                    //            + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"},"
+                    //                + "\"force_notification\": true"
+                    //                + "}";
+
+                    //    string result2 = SMSHelper.PushApp(conment);
+                    //    _logger.LogInformation("result2:" + result2);
+                    //    JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                    //    if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
+                    //    {
+                    //        var isOK = jobjectresult["isOK"].ToString();
+
+                    //        foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                    //        {
+                    //            if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
+                    //            {
+                    //                var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                    //                projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                    //                projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
+                    //                projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
+                    //                projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
+                    //                projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
+                    //                projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
+                    //                projectfasongxiaoxi.RecStatus = "A";
+                    //                projectfasongxiaoxi.Createtime = DateTime.Now;
+                    //                _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+                    //            }
+                    //        }
+                    //        _context.SaveChanges();
+                    //    }
+
+
+
+                    //    _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename);
+                    //}
+                }
+                //涓氬姟缁忕悊涓虹┖
+                if (true)
+                {
+                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null).ToList();
+                    for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++)
+                    {
+                        string conment = "{"
+                             + "\"appkey\": \"" + appkey + "\","
+                              + "\"senderId\": \"kehujingli\","
+                                 + "\"senderData\": { \"avatar\": \"\",\"name\": \"瀹㈡埛缁忕悊\"},"
+                                   + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+                                    + "\"type\": \"text\","
+                                     + "\"payload\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�400-028-8080 \","
+                                       + "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔� \",\"body\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔� \","
+                                       + "\"vendorOptions\": {\"huawei\": {\"category\": \"" + huawei + "\"},\"oppo\": {\"channel_id\": \"" + oppo + "\"},\"xiaomi\": {\"channel_id\": \"" + xiaomi + "\"},\"vivo\": {\"classification\":" + vivo + "}}"
+                                       + "}"
+                            + "}";
+
+                        string result2 = SMSHelper.PushAppduandu(conment);
+                        _logger.LogInformation("result2:" + result2);
+                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "200")
+                        {
+                            var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                            projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                            projectfasongxiaoxi.ProjectId = projectfasongxiaoxisywjl[i].ProjectId;
+                            projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId;
+                            projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing;
+                            projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei;
+                            projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl;
+                            projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname;
+                            projectfasongxiaoxi.RecStatus = "A";
+                            projectfasongxiaoxi.Createtime = DateTime.Now;
+                            _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+
+                        }
+                        _context.SaveChanges();
+                        _logger.LogInformation("鏃犱笟鍔＄粡鐞嗘帹閫乤pp缁欏鎴锋帹閫乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname);
+
+                    }
+
+                    //var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
+                    //int j = 0;
+                    //while (j * 1000 <= projectfasongxiaoxisywjl.Count)
+                    //{
+                    //    j = j + 1;
+                    //    string numberstring = "";
+                    //    string customename = "";
+                    //    if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
+                    //    {
+                    //        int countt = (j * 1000);
+                    //        if (countt > projectfasongxiaoxisywjl.Count)
+                    //        {
+                    //            countt = projectfasongxiaoxisywjl.Count;
+                    //        }
+                    //        for (int i = 0; i < countt; i++)
+                    //        {
+                    //            if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
+                    //            {
+                    //                continue;
+                    //            }
+                    //            numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
+                    //            customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
+
+                    //        }
+                    //    }
+
+                    //    if (numberstring.EndsWith(","))
+                    //    {
+                    //        numberstring = numberstring.Substring(0, numberstring.Length - 1);
+                    //    }
+                    //    if (string.IsNullOrEmpty(numberstring))
+                    //    {
+                    //        continue;
+                    //    }
+                    //    string conment = "{"
+                    //        + "\"title\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔","
+                    //        + "\"content\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�400-028-8080 \","
+                    //          + "\"getui_alias\": [" + numberstring + "],"
+                    //            + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�400-028-8080 \"},"
+                    //                + "\"force_notification\": true"
+                    //                + "}";
+
+                    //    string result2 = SMSHelper.PushApp(conment);
+                    //    _logger.LogInformation("result2:" + result2);
+                    //    JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                    //    if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
+                    //    {
+                    //        var isOK = jobjectresult["isOK"].ToString();
+
+                    //        foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                    //        {
+                    //            if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
+                    //            {
+                    //                var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                    //                projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                    //                projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
+                    //                projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
+                    //                projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
+                    //                projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
+                    //                projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
+                    //                projectfasongxiaoxi.RecStatus = "A";
+                    //                projectfasongxiaoxi.Createtime = DateTime.Now;
+                    //                _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+                    //            }
+                    //        }
+                    //        _context.SaveChanges();
+                    //    }
+
+
+
+                    //    _logger.LogInformation("鏃犱笟鍔＄粡鐞嗘帹閫乤pp缁欏鎴�" + customename);
+                    //}
+
+
+
+                }
+
+
+              
+
+
+
+
 
             }
             catch (Exception ex)
@@ -988,7 +1111,7 @@
                                 projectfasongxiaoxiDTO.Xiaoxizhonglei = "app";
                                 projectfasongxiaoxiDTO.Gyszl = "2";
                                 projectfasongxiaoxiDTO.Khname = project1.Drhx;
-                                projectfasongxiaoxiDTO.RecStatus = project1.Drhx;
+                                projectfasongxiaoxiDTO.RecStatus = "A";
                                 projectfasongxiaoxiDTO.Createtime = DateTime.Now;
                                 projectfasongxiaoxiDTO.Projectname = project1.Name;
                                 projectfasongxiaoxiDTOsapp.Add(projectfasongxiaoxiDTO);
@@ -1014,8 +1137,8 @@
                                 projectfasongxiaoxiDTO.Xiaoxileixing = "2";
                                 projectfasongxiaoxiDTO.Xiaoxizhonglei = "duanxin";
                                 projectfasongxiaoxiDTO.Gyszl = "3";
-                                projectfasongxiaoxiDTO.Khname = project1.Drhx;
-                                projectfasongxiaoxiDTO.RecStatus = project1.Drhx;
+                                projectfasongxiaoxiDTO.Khname = project1.Dshx;
+                                projectfasongxiaoxiDTO.RecStatus = "A";
                                 projectfasongxiaoxiDTO.Createtime = DateTime.Now;
                                 projectfasongxiaoxiDTO.Projectname = project1.Name;
                                 projectfasongxiaoxiDTOsduanxin.Add(projectfasongxiaoxiDTO);
@@ -1033,7 +1156,7 @@
                                 projectfasongxiaoxiDTO.Xiaoxileixing = "2";
                                 projectfasongxiaoxiDTO.Xiaoxizhonglei = "app";
                                 projectfasongxiaoxiDTO.Gyszl = "3";
-                                projectfasongxiaoxiDTO.Khname = project1.Drhx;
+                                projectfasongxiaoxiDTO.Khname = project1.Dshx;
                                 projectfasongxiaoxiDTO.RecStatus = "A";
                                 projectfasongxiaoxiDTO.Createtime = DateTime.Now;
                                 projectfasongxiaoxiDTO.Projectname = project1.Name;
@@ -1180,10 +1303,10 @@
                             projectfasongxiaoxiDTO1.Ywjl = cooperatecustomCustomer.Ywjl;
                             projectfasongxiaoxiDTO1.KhId = cooperatecustomCustomer.Id;
                             projectfasongxiaoxiDTO1.HuiyuanId = cooperatecustomCustomer.HuiyuanId;
-                            projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
+                            //projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
 
                             //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛�
-                            var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id && x.Huiyuanid != cooperatecustomCustomer.HuiyuanId).ToList();
+                            var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id).ToList();
                             if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0)
                             {
                                 var huiyuanids = new List<Guid>();
@@ -1210,6 +1333,24 @@
                                         projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
                                         projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
                                         projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+                                        string name = "";
+                                        var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+                                        if (imUserInfo != null)
+                                        {
+                                            name = imUserInfo.NickName;
+                                        }
+                                        else
+                                        {
+                                            if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+                                            {
+                                                name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+                                            }
+                                            else
+                                            {
+                                                name = frameworkUser.Name;
+                                            }
+                                        }
+                                        projectfasongxiaoxiDTO.HuiyuanName = name;
                                         projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
                                     }
                                 }
@@ -1229,10 +1370,10 @@
                         projectfasongxiaoxiDTO1.Ywjl = intentionCustomer.Ywjl;
                         projectfasongxiaoxiDTO1.KhId = intentionCustomer.Id;
                         projectfasongxiaoxiDTO1.HuiyuanId = intentionCustomer.HuiyuanId;
-                        projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
+                        //projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
 
                         //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛�
-                        var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id && x.Huiyuanid != intentionCustomer.HuiyuanId).ToList();
+                        var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id).ToList();
                         if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0)
                         {
                             var huiyuanids = new List<Guid>();
@@ -1259,106 +1400,30 @@
                                     projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
                                     projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
                                     projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+                                    string name = "";
+                                    var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+                                    if (imUserInfo != null)
+                                    {
+                                        name = imUserInfo.NickName;
+                                    }
+                                    else
+                                    {
+                                        if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+                                        {
+                                            name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+                                        }
+                                        else
+                                        {
+                                            name = frameworkUser.Name;
+                                        }
+                                    }
+                                    projectfasongxiaoxiDTO.HuiyuanName = name;
                                     projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
                                 }
                             }
                         }
                     }
                 }
-
-
-                //鎺ㄩ�丄pp
-                foreach (var ywjl in Ywjl)
-                {
-
-                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList();
-
-
-                    for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++)
-                    {
-                        string conment = "{"
-                    + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒","
-                    + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
-                      + "\"getui_alias\": \"" + projectfasongxiaoxisywjl[i].Tel + "\","
-                        + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"},"
-                            + "\"force_notification\": true"
-                            + "}";
-
-                        string result2 = SMSHelper.PushApp(conment);
-                        _logger.LogInformation("result2:" + result2);
-                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
-
-                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
-                        {
-                            var isOK = jobjectresult["isOK"].ToString();
-
-
-                            if (isOK.IndexOf(projectfasongxiaoxisywjl[i].Tel) >= 0)
-                            {
-                                var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId;
-                                projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing;
-                                projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei;
-                                projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl;
-                                projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname;
-                                projectfasongxiaoxi.RecStatus = "A";
-                                projectfasongxiaoxi.Createtime = DateTime.Now;
-                                _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
-                            }
-                        }
-                        _context.SaveChanges();
-                        _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname);
-
-                    }
-                }
-                //涓氬姟缁忕悊涓虹┖
-                if (true)
-                {
-                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
-
-                        for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++)
-                        {
-                            string conment = "{"
-                        + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒","
-                        + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
-                          + "\"getui_alias\": \"" + projectfasongxiaoxisywjl[i].Tel + "\","
-                            + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \"},"
-                                + "\"force_notification\": true"
-                                + "}";
-
-                            string result2 = SMSHelper.PushApp(conment);
-                            _logger.LogInformation("result2:" + result2);
-                            JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
-
-                            if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
-                            {
-                                var isOK = jobjectresult["isOK"].ToString();
-
-
-                                if (isOK.IndexOf(projectfasongxiaoxisywjl[i].Tel) >= 0)
-                                {
-                                    var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                    projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                    projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId;
-                                    projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing;
-                                    projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei;
-                                    projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl;
-                                    projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname;
-                                    projectfasongxiaoxi.RecStatus = "A";
-                                    projectfasongxiaoxi.Createtime = DateTime.Now;
-                                    _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
-                                }
-                            }
-                            _context.SaveChanges();
-                            _logger.LogInformation(  "鏃犱笟鍔＄粡鐞嗘帹閫乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname);
-
-                        }
-
-                }
-
-
-
                 //鍙戦�佺煭淇�
                 foreach (var ywjl in Ywjl)
                 {
@@ -1494,6 +1559,175 @@
 
                     }
                 }
+
+                //鎺ㄩ�丄pp
+                foreach (var ywjl in Ywjl)
+                {
+                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id).ToList();
+                    for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++)
+                    {
+                        string conment = "{"
+                             + "\"appkey\": \"" + appkey + "\","
+                              + "\"senderId\": \"" + ywjl.UserSn + "\","
+                                 + "\"senderData\": { \"avatar\": \"\",\"name\": \"" + ywjl.UserName + "\"},"
+                                   + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+                                    + "\"type\": \"text\","
+                                     + "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+                                       + "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \","
+                                       + "\"vendorOptions\": {\"huawei\": {\"category\": \"" + huawei + "\"},\"oppo\": {\"channel_id\": \"" + oppo + "\"},\"xiaomi\": {\"channel_id\": \"" + xiaomi + "\"},\"vivo\": {\"classification\":" + vivo + "}}"
+                                       + "}"
+                            + "}";
+
+                        string result2 = SMSHelper.PushAppduandu(conment);
+                        _logger.LogInformation("result2:" + result2);
+                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "200")
+                        {
+                            var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                            projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                            projectfasongxiaoxi.ProjectId = projectfasongxiaoxisywjl[i].ProjectId;
+                            projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId;
+                            projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing;
+                            projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei;
+                            projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl;
+                            projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname;
+                            projectfasongxiaoxi.RecStatus = "A";
+                            projectfasongxiaoxi.Createtime = DateTime.Now;
+                            _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+
+                        }
+                        _context.SaveChanges();
+                        _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname);
+
+                    }
+                    //var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList();
+
+
+                    //for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++)
+                    //{
+                    //    string conment = "{"
+                    //+ "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒","
+                    //+ "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+                    //  + "\"getui_alias\": \"" + projectfasongxiaoxisywjl[i].Tel + "\","
+                    //    + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"},"
+                    //        + "\"force_notification\": true"
+                    //        + "}";
+
+                    //    string result2 = SMSHelper.PushApp(conment);
+                    //    _logger.LogInformation("result2:" + result2);
+                    //    JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                    //    if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
+                    //    {
+                    //        var isOK = jobjectresult["isOK"].ToString();
+
+
+                    //        if (isOK.IndexOf(projectfasongxiaoxisywjl[i].Tel) >= 0)
+                    //        {
+                    //            var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                    //            projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                    //            projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId;
+                    //            projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing;
+                    //            projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei;
+                    //            projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl;
+                    //            projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname;
+                    //            projectfasongxiaoxi.RecStatus = "A";
+                    //            projectfasongxiaoxi.Createtime = DateTime.Now;
+                    //            _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+                    //        }
+                    //    }
+                    //    _context.SaveChanges();
+                    //    _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname);
+
+                    //}
+                }
+                //涓氬姟缁忕悊涓虹┖
+                if (true)
+                {
+                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null).ToList();
+                    for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++)
+                    {
+                        string conment = "{"
+                             + "\"appkey\": \"" + appkey + "\","
+                              + "\"senderId\": \"kehujingli\","
+                                 + "\"senderData\": { \"avatar\": \"\",\"name\": \"瀹㈡埛缁忕悊\"},"
+                                   + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+                                    + "\"type\": \"text\","
+                                     + "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080  \","
+                                       + "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \","
+                                       + "\"vendorOptions\": {\"huawei\": {\"category\": \"" + huawei + "\"},\"oppo\": {\"channel_id\": \"" + oppo + "\"},\"xiaomi\": {\"channel_id\": \"" + xiaomi + "\"},\"vivo\": {\"classification\":" + vivo + "}}"
+                                       + "}"
+                            + "}";
+
+                        string result2 = SMSHelper.PushAppduandu(conment);
+                        _logger.LogInformation("result2:" + result2);
+                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "200")
+                        {
+                            var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                            projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                            projectfasongxiaoxi.ProjectId = projectfasongxiaoxisywjl[i].ProjectId;
+                            projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId;
+                            projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing;
+                            projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei;
+                            projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl;
+                            projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname;
+                            projectfasongxiaoxi.RecStatus = "A";
+                            projectfasongxiaoxi.Createtime = DateTime.Now;
+                            _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+
+                        }
+                        _context.SaveChanges();
+                        _logger.LogInformation("鏃犱笟鍔＄粡鐞嗘帹閫乤pp缁欏鎴锋帹閫乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname);
+
+                    }
+                    //var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
+
+                    //    for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++)
+                    //    {
+                    //        string conment = "{"
+                    //    + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒","
+                    //    + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
+                    //      + "\"getui_alias\": \"" + projectfasongxiaoxisywjl[i].Tel + "\","
+                    //        + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \"},"
+                    //            + "\"force_notification\": true"
+                    //            + "}";
+
+                    //        string result2 = SMSHelper.PushApp(conment);
+                    //        _logger.LogInformation("result2:" + result2);
+                    //        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                    //        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
+                    //        {
+                    //            var isOK = jobjectresult["isOK"].ToString();
+
+
+                    //            if (isOK.IndexOf(projectfasongxiaoxisywjl[i].Tel) >= 0)
+                    //            {
+                    //                var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                    //                projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                    //                projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId;
+                    //                projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing;
+                    //                projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei;
+                    //                projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl;
+                    //                projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname;
+                    //                projectfasongxiaoxi.RecStatus = "A";
+                    //                projectfasongxiaoxi.Createtime = DateTime.Now;
+                    //                _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+                    //            }
+                    //        }
+                    //        _context.SaveChanges();
+                    //        _logger.LogInformation(  "鏃犱笟鍔＄粡鐞嗘帹閫乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname);
+
+                    //    }
+
+                }
+
+
+
+             
 
             }
             catch (Exception ex)
@@ -1708,10 +1942,10 @@
                             projectfasongxiaoxiDTO1.Ywjl = cooperatecustomCustomer.Ywjl;
                             projectfasongxiaoxiDTO1.KhId = cooperatecustomCustomer.Id;
                             projectfasongxiaoxiDTO1.HuiyuanId = cooperatecustomCustomer.HuiyuanId;
-                            projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
+                            //projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
 
                             //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛�
-                            var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id && x.Huiyuanid != cooperatecustomCustomer.HuiyuanId).ToList();
+                            var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id).ToList();
                             if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0)
                             {
                                 var huiyuanids = new List<Guid>();
@@ -1738,6 +1972,24 @@
                                         projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
                                         projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
                                         projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+                                        string name = "";
+                                        var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+                                        if (imUserInfo != null)
+                                        {
+                                            name = imUserInfo.NickName;
+                                        }
+                                        else
+                                        {
+                                            if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+                                            {
+                                                name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+                                            }
+                                            else
+                                            {
+                                                name = frameworkUser.Name;
+                                            }
+                                        }
+                                        projectfasongxiaoxiDTO.HuiyuanName = name;
                                         projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
                                     }
                                 }
@@ -1757,10 +2009,10 @@
                         projectfasongxiaoxiDTO1.Ywjl = intentionCustomer.Ywjl;
                         projectfasongxiaoxiDTO1.KhId = intentionCustomer.Id;
                         projectfasongxiaoxiDTO1.HuiyuanId = intentionCustomer.HuiyuanId;
-                        projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
+                        //projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
 
                         //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛�
-                        var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id && x.Huiyuanid != intentionCustomer.HuiyuanId).ToList();
+                        var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id).ToList();
                         if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0)
                         {
                             var huiyuanids = new List<Guid>();
@@ -1787,177 +2039,30 @@
                                     projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
                                     projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
                                     projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+                                    string name = "";
+                                    var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+                                    if (imUserInfo != null)
+                                    {
+                                        name = imUserInfo.NickName;
+                                    }
+                                    else
+                                    {
+                                        if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+                                        {
+                                            name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+                                        }
+                                        else
+                                        {
+                                            name = frameworkUser.Name;
+                                        }
+                                    }
+                                    projectfasongxiaoxiDTO.HuiyuanName = name;
                                     projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
                                 }
                             }
                         }
                     }
                 }
-
-
-                //鎺ㄩ�丄pp
-                foreach (var ywjl in Ywjl)
-                {
-
-                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList();
-                    int j = 0;
-                    while (j * 1000 <= projectfasongxiaoxisywjl.Count)
-                    {
-                        j = j + 1;
-                        string numberstring = "";
-                        string customename = "";
-                        if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
-                        {
-                            int countt = (j * 1000);
-                            if (countt > projectfasongxiaoxisywjl.Count)
-                            {
-                                countt = projectfasongxiaoxisywjl.Count;
-                            }
-
-                            for (int i = 0; i < countt; i++)
-                            {
-                                if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
-                                {
-                                    continue;
-                                }
-                                numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
-                                customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
-
-                            }
-                        }
-
-                        if (numberstring.EndsWith(","))
-                        {
-                            numberstring = numberstring.Substring(0, numberstring.Length - 1);
-                        }
-                        if (string.IsNullOrEmpty(numberstring))
-                        {
-                            continue;
-                        }
-                        string conment = "{"
-                            + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒","
-                            + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
-                              + "\"getui_alias\": [" + numberstring + "],"
-                                + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"},"
-                                    + "\"force_notification\": true"
-                                    + "}";
-
-                        string result2 = SMSHelper.PushApp(conment);
-                        _logger.LogInformation("result2:" + result2);
-                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
-
-                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
-                        {
-                            var isOK = jobjectresult["isOK"].ToString();
-
-                            foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                            {
-                                if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
-                                {
-                                    var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                    projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                    projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
-                                    projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
-                                    projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
-                                    projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
-                                    projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
-                                    projectfasongxiaoxi.RecStatus = "A";
-                                    projectfasongxiaoxi.Createtime = DateTime.Now;
-                                    _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
-                                }
-                            }
-                            _context.SaveChanges();
-                        }
-
-
-
-                        _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename);
-                    }
-
-
-                 
-                }
-                //涓氬姟缁忕悊涓虹┖
-                if (true)
-                {
-                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
-                    int j = 0;
-                    while (j * 1000 <= projectfasongxiaoxisywjl.Count)
-                    {
-                        j = j + 1;
-                        string numberstring = "";
-                        string customename = "";
-                        if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
-                        {
-                            int countt = (j * 1000);
-                            if (countt > projectfasongxiaoxisywjl.Count)
-                            {
-                                countt = projectfasongxiaoxisywjl.Count;
-                            }
-
-                            for (int i = 0; i < countt; i++)
-                            {
-                                if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
-                                {
-                                    continue;
-                                }
-                                numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
-                                customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
-
-                            }
-                        }
-
-                        if (numberstring.EndsWith(","))
-                        {
-                            numberstring = numberstring.Substring(0, numberstring.Length - 1);
-                        }
-                        if (string.IsNullOrEmpty(numberstring))
-                        {
-                            continue;
-                        }
-                        string conment = "{"
-                            + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒","
-                            + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
-                              + "\"getui_alias\": [" + numberstring + "],"
-                                + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \"},"
-                                    + "\"force_notification\": true"
-                                    + "}";
-
-                        string result2 = SMSHelper.PushApp(conment);
-                        _logger.LogInformation("result2:" + result2);
-                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
-
-                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
-                        {
-                            var isOK = jobjectresult["isOK"].ToString();
-
-                            foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                            {
-                                if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
-                                {
-                                    var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                    projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                    projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
-                                    projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
-                                    projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
-                                    projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
-                                    projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
-                                    projectfasongxiaoxi.RecStatus = "A";
-                                    projectfasongxiaoxi.Createtime = DateTime.Now;
-                                    _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
-                                }
-                            }
-                            _context.SaveChanges();
-                        }
-
-
-
-                        _logger.LogInformation( "鏃犱笟鍔＄粡鐞嗘帹閫乤pp缁欏鎴�" + customename);
-                    }
-
-                }
-
-
 
                 //鍙戦�佺煭淇�
                 foreach (var ywjl in Ywjl)
@@ -2094,6 +2199,248 @@
 
                     }
                 }
+
+                //鎺ㄩ�丄pp
+                foreach (var ywjl in Ywjl)
+                {
+                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id).ToList();
+                    for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++)
+                    {
+                        string conment = "{"
+                             + "\"appkey\": \"" + appkey + "\","
+                              + "\"senderId\": \"" + ywjl.UserSn + "\","
+                                 + "\"senderData\": { \"avatar\": \"\",\"name\": \"" + ywjl.UserName + "\"},"
+                                   + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+                                    + "\"type\": \"text\","
+                                     + "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+                                       + "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \","
+                                       + "\"vendorOptions\": {\"huawei\": {\"category\": \"" + huawei + "\"},\"oppo\": {\"channel_id\": \"" + oppo + "\"},\"xiaomi\": {\"channel_id\": \"" + xiaomi + "\"},\"vivo\": {\"classification\":" + vivo + "}}"
+                                       + "}"
+                            + "}";
+
+                        string result2 = SMSHelper.PushAppduandu(conment);
+                        _logger.LogInformation("result2:" + result2);
+                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "200")
+                        {
+                            var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                            projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                            projectfasongxiaoxi.ProjectId = projectfasongxiaoxisywjl[i].ProjectId;
+                            projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId;
+                            projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing;
+                            projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei;
+                            projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl;
+                            projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname;
+                            projectfasongxiaoxi.RecStatus = "A";
+                            projectfasongxiaoxi.Createtime = DateTime.Now;
+                            _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+
+                        }
+                        _context.SaveChanges();
+                        _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname);
+
+                    }
+
+                    //var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList();
+                    //int j = 0;
+                    //while (j * 1000 <= projectfasongxiaoxisywjl.Count)
+                    //{
+                    //    j = j + 1;
+                    //    string numberstring = "";
+                    //    string customename = "";
+                    //    if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
+                    //    {
+                    //        int countt = (j * 1000);
+                    //        if (countt > projectfasongxiaoxisywjl.Count)
+                    //        {
+                    //            countt = projectfasongxiaoxisywjl.Count;
+                    //        }
+
+                    //        for (int i = 0; i < countt; i++)
+                    //        {
+                    //            if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
+                    //            {
+                    //                continue;
+                    //            }
+                    //            numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
+                    //            customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
+
+                    //        }
+                    //    }
+
+                    //    if (numberstring.EndsWith(","))
+                    //    {
+                    //        numberstring = numberstring.Substring(0, numberstring.Length - 1);
+                    //    }
+                    //    if (string.IsNullOrEmpty(numberstring))
+                    //    {
+                    //        continue;
+                    //    }
+                    //    string conment = "{"
+                    //        + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒","
+                    //        + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+                    //          + "\"getui_alias\": [" + numberstring + "],"
+                    //            + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"},"
+                    //                + "\"force_notification\": true"
+                    //                + "}";
+
+                    //    string result2 = SMSHelper.PushApp(conment);
+                    //    _logger.LogInformation("result2:" + result2);
+                    //    JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                    //    if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
+                    //    {
+                    //        var isOK = jobjectresult["isOK"].ToString();
+
+                    //        foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                    //        {
+                    //            if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
+                    //            {
+                    //                var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                    //                projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                    //                projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
+                    //                projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
+                    //                projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
+                    //                projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
+                    //                projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
+                    //                projectfasongxiaoxi.RecStatus = "A";
+                    //                projectfasongxiaoxi.Createtime = DateTime.Now;
+                    //                _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+                    //            }
+                    //        }
+                    //        _context.SaveChanges();
+                    //    }
+
+
+
+                    //    _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename);
+                    //}
+
+
+
+                }
+                //涓氬姟缁忕悊涓虹┖
+                if (true)
+                {
+                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null).ToList();
+                    for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++)
+                    {
+                        string conment = "{"
+                             + "\"appkey\": \"" + appkey + "\","
+                              + "\"senderId\": \"kehujingli\","
+                                 + "\"senderData\": { \"avatar\": \"\",\"name\": \"瀹㈡埛缁忕悊\"},"
+                                   + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+                                    + "\"type\": \"text\","
+                                     + "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
+                                       + "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \","
+                                       + "\"vendorOptions\": {\"huawei\": {\"category\": \"" + huawei + "\"},\"oppo\": {\"channel_id\": \"" + oppo + "\"},\"xiaomi\": {\"channel_id\": \"" + xiaomi + "\"},\"vivo\": {\"classification\":" + vivo + "}}"
+                                       + "}"
+                            + "}";
+
+                        string result2 = SMSHelper.PushAppduandu(conment);
+                        _logger.LogInformation("result2:" + result2);
+                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "200")
+                        {
+                            var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                            projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                            projectfasongxiaoxi.ProjectId = projectfasongxiaoxisywjl[i].ProjectId;
+                            projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId;
+                            projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing;
+                            projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei;
+                            projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl;
+                            projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname;
+                            projectfasongxiaoxi.RecStatus = "A";
+                            projectfasongxiaoxi.Createtime = DateTime.Now;
+                            _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+
+                        }
+                        _context.SaveChanges();
+                        _logger.LogInformation("鏃犱笟鍔＄粡鐞嗘帹閫乤pp缁欏鎴锋帹閫乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname);
+
+                    }
+                    //var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
+                    //int j = 0;
+                    //while (j * 1000 <= projectfasongxiaoxisywjl.Count)
+                    //{
+                    //    j = j + 1;
+                    //    string numberstring = "";
+                    //    string customename = "";
+                    //    if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
+                    //    {
+                    //        int countt = (j * 1000);
+                    //        if (countt > projectfasongxiaoxisywjl.Count)
+                    //        {
+                    //            countt = projectfasongxiaoxisywjl.Count;
+                    //        }
+
+                    //        for (int i = 0; i < countt; i++)
+                    //        {
+                    //            if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
+                    //            {
+                    //                continue;
+                    //            }
+                    //            numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
+                    //            customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
+
+                    //        }
+                    //    }
+
+                    //    if (numberstring.EndsWith(","))
+                    //    {
+                    //        numberstring = numberstring.Substring(0, numberstring.Length - 1);
+                    //    }
+                    //    if (string.IsNullOrEmpty(numberstring))
+                    //    {
+                    //        continue;
+                    //    }
+                    //    string conment = "{"
+                    //        + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒","
+                    //        + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
+                    //          + "\"getui_alias\": [" + numberstring + "],"
+                    //            + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \"},"
+                    //                + "\"force_notification\": true"
+                    //                + "}";
+
+                    //    string result2 = SMSHelper.PushApp(conment);
+                    //    _logger.LogInformation("result2:" + result2);
+                    //    JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                    //    if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
+                    //    {
+                    //        var isOK = jobjectresult["isOK"].ToString();
+
+                    //        foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                    //        {
+                    //            if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
+                    //            {
+                    //                var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                    //                projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                    //                projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
+                    //                projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
+                    //                projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
+                    //                projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
+                    //                projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
+                    //                projectfasongxiaoxi.RecStatus = "A";
+                    //                projectfasongxiaoxi.Createtime = DateTime.Now;
+                    //                _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+                    //            }
+                    //        }
+                    //        _context.SaveChanges();
+                    //    }
+
+
+
+                    //    _logger.LogInformation( "鏃犱笟鍔＄粡鐞嗘帹閫乤pp缁欏鎴�" + customename);
+                    //}
+
+                }
+
+
+
+               
 
             }
             catch (Exception ex)
@@ -2301,10 +2648,10 @@
                             projectfasongxiaoxiDTO1.Ywjl = cooperatecustomCustomer.Ywjl;
                             projectfasongxiaoxiDTO1.KhId = cooperatecustomCustomer.Id;
                             projectfasongxiaoxiDTO1.HuiyuanId = cooperatecustomCustomer.HuiyuanId;
-                            projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
+                            //projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
 
                             //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛�
-                            var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id && x.Huiyuanid != cooperatecustomCustomer.HuiyuanId).ToList();
+                            var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id).ToList();
                             if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0)
                             {
                                 var huiyuanids = new List<Guid>();
@@ -2331,6 +2678,24 @@
                                         projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
                                         projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
                                         projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+                                        string name = "";
+                                        var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+                                        if (imUserInfo != null)
+                                        {
+                                            name = imUserInfo.NickName;
+                                        }
+                                        else
+                                        {
+                                            if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+                                            {
+                                                name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+                                            }
+                                            else
+                                            {
+                                                name = frameworkUser.Name;
+                                            }
+                                        }
+                                        projectfasongxiaoxiDTO.HuiyuanName = name;
                                         projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
                                     }
                                 }
@@ -2350,10 +2715,10 @@
                         projectfasongxiaoxiDTO1.Ywjl = intentionCustomer.Ywjl;
                         projectfasongxiaoxiDTO1.KhId = intentionCustomer.Id;
                         projectfasongxiaoxiDTO1.HuiyuanId = intentionCustomer.HuiyuanId;
-                        projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
+                        //projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
 
                         //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛�
-                        var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id && x.Huiyuanid != intentionCustomer.HuiyuanId).ToList();
+                        var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id).ToList();
                         if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0)
                         {
                             var huiyuanids = new List<Guid>();
@@ -2380,177 +2745,30 @@
                                     projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
                                     projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
                                     projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+                                    string name = "";
+                                    var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+                                    if (imUserInfo != null)
+                                    {
+                                        name = imUserInfo.NickName;
+                                    }
+                                    else
+                                    {
+                                        if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+                                        {
+                                            name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+                                        }
+                                        else
+                                        {
+                                            name = frameworkUser.Name;
+                                        }
+                                    }
+                                    projectfasongxiaoxiDTO.HuiyuanName = name;
                                     projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
                                 }
                             }
                         }
                     }
                 }
-
-
-                //鎺ㄩ�丄pp
-                foreach (var ywjl in Ywjl)
-                {
-
-                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList();
-                    int j = 0;
-                    while (j * 1000 <= projectfasongxiaoxisywjl.Count)
-                    {
-                        j = j + 1;
-                        string numberstring = "";
-                        string customename = "";
-                        if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
-                        {
-                            int countt = (j * 1000);
-                            if (countt > projectfasongxiaoxisywjl.Count)
-                            {
-                                countt = projectfasongxiaoxisywjl.Count;
-                            }
-
-                            for (int i = 0; i < countt; i++)
-                            {
-                                if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
-                                {
-                                    continue;
-                                }
-                                numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
-                                customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
-
-                            }
-                        }
-
-                        if (numberstring.EndsWith(","))
-                        {
-                            numberstring = numberstring.Substring(0, numberstring.Length - 1);
-                        }
-                        if (string.IsNullOrEmpty(numberstring))
-                        {
-                            continue;
-                        }
-                        string conment = "{"
-                            + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒","
-                            + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
-                              + "\"getui_alias\": [" + numberstring + "],"
-                                + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"},"
-                                    + "\"force_notification\": true"
-                                    + "}";
-
-                        string result2 = SMSHelper.PushApp(conment);
-                        _logger.LogInformation("result2:" + result2);
-                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
-
-                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
-                        {
-                            var isOK = jobjectresult["isOK"].ToString();
-
-                            foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                            {
-                                if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
-                                {
-                                    var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                    projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                    projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
-                                    projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
-                                    projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
-                                    projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
-                                    projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
-                                    projectfasongxiaoxi.RecStatus = "A";
-                                    projectfasongxiaoxi.Createtime = DateTime.Now;
-                                    _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
-                                }
-                            }
-                            _context.SaveChanges();
-                        }
-
-
-
-                        _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename);
-                    }
-
-
-
-                }
-                //涓氬姟缁忕悊涓虹┖
-                if (true)
-                {
-                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
-                    int j = 0;
-                    while (j * 1000 <= projectfasongxiaoxisywjl.Count)
-                    {
-                        j = j + 1;
-                        string numberstring = "";
-                        string customename = "";
-                        if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
-                        {
-                            int countt = (j * 1000);
-                            if (countt > projectfasongxiaoxisywjl.Count)
-                            {
-                                countt = projectfasongxiaoxisywjl.Count;
-                            }
-
-                            for (int i = 0; i < countt; i++)
-                            {
-                                if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
-                                {
-                                    continue;
-                                }
-                                numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
-                                customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
-
-                            }
-                        }
-
-                        if (numberstring.EndsWith(","))
-                        {
-                            numberstring = numberstring.Substring(0, numberstring.Length - 1);
-                        }
-                        if (string.IsNullOrEmpty(numberstring))
-                        {
-                            continue;
-                        }
-                        string conment = "{"
-                            + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒","
-                            + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
-                              + "\"getui_alias\": [" + numberstring + "],"
-                                + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \"},"
-                                    + "\"force_notification\": true"
-                                    + "}";
-
-                        string result2 = SMSHelper.PushApp(conment);
-                        _logger.LogInformation("result2:" + result2);
-                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
-
-                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
-                        {
-                            var isOK = jobjectresult["isOK"].ToString();
-
-                            foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                            {
-                                if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
-                                {
-                                    var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                    projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                    projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
-                                    projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
-                                    projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
-                                    projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
-                                    projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
-                                    projectfasongxiaoxi.RecStatus = "A";
-                                    projectfasongxiaoxi.Createtime = DateTime.Now;
-                                    _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
-                                }
-                            }
-                            _context.SaveChanges();
-                        }
-
-
-
-                        _logger.LogInformation("鏃犱笟鍔＄粡鐞嗘帹閫乤pp缁欏鎴�" + customename);
-                    }
-
-                }
-
-
 
                 //鍙戦�佺煭淇�
                 foreach (var ywjl in Ywjl)
@@ -2687,6 +2905,249 @@
 
                     }
                 }
+
+                //鎺ㄩ�丄pp
+                foreach (var ywjl in Ywjl)
+                {
+                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id).ToList();
+                    for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++)
+                    {
+                        string conment = "{"
+                             + "\"appkey\": \"" + appkey + "\","
+                              + "\"senderId\": \"" + ywjl.UserSn + "\","
+                                 + "\"senderData\": { \"avatar\": \"\",\"name\": \"" + ywjl.UserName + "\"},"
+                                   + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+                                    + "\"type\": \"text\","
+                                     + "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+                                       + "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵� \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵� \","
+                                       + "\"vendorOptions\": {\"huawei\": {\"category\": \"" + huawei + "\"},\"oppo\": {\"channel_id\": \"" + oppo + "\"},\"xiaomi\": {\"channel_id\": \"" + xiaomi + "\"},\"vivo\": {\"classification\":" + vivo + "}}"
+                                       + "}"
+                            + "}";
+
+                        string result2 = SMSHelper.PushAppduandu(conment);
+                        _logger.LogInformation("result2:" + result2);
+                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "200")
+                        {
+                            var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                            projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                            projectfasongxiaoxi.ProjectId = projectfasongxiaoxisywjl[i].ProjectId;
+                            projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId;
+                            projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing;
+                            projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei;
+                            projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl;
+                            projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname;
+                            projectfasongxiaoxi.RecStatus = "A";
+                            projectfasongxiaoxi.Createtime = DateTime.Now;
+                            _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+
+                        }
+                        _context.SaveChanges();
+                        _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname);
+
+                    }
+
+                    //var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList();
+                    //int j = 0;
+                    //while (j * 1000 <= projectfasongxiaoxisywjl.Count)
+                    //{
+                    //    j = j + 1;
+                    //    string numberstring = "";
+                    //    string customename = "";
+                    //    if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
+                    //    {
+                    //        int countt = (j * 1000);
+                    //        if (countt > projectfasongxiaoxisywjl.Count)
+                    //        {
+                    //            countt = projectfasongxiaoxisywjl.Count;
+                    //        }
+
+                    //        for (int i = 0; i < countt; i++)
+                    //        {
+                    //            if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
+                    //            {
+                    //                continue;
+                    //            }
+                    //            numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
+                    //            customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
+
+                    //        }
+                    //    }
+
+                    //    if (numberstring.EndsWith(","))
+                    //    {
+                    //        numberstring = numberstring.Substring(0, numberstring.Length - 1);
+                    //    }
+                    //    if (string.IsNullOrEmpty(numberstring))
+                    //    {
+                    //        continue;
+                    //    }
+                    //    string conment = "{"
+                    //        + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒","
+                    //        + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+                    //          + "\"getui_alias\": [" + numberstring + "],"
+                    //            + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"},"
+                    //                + "\"force_notification\": true"
+                    //                + "}";
+
+                    //    string result2 = SMSHelper.PushApp(conment);
+                    //    _logger.LogInformation("result2:" + result2);
+                    //    JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                    //    if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
+                    //    {
+                    //        var isOK = jobjectresult["isOK"].ToString();
+
+                    //        foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                    //        {
+                    //            if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
+                    //            {
+                    //                var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                    //                projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                    //                projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
+                    //                projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
+                    //                projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
+                    //                projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
+                    //                projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
+                    //                projectfasongxiaoxi.RecStatus = "A";
+                    //                projectfasongxiaoxi.Createtime = DateTime.Now;
+                    //                _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+                    //            }
+                    //        }
+                    //        _context.SaveChanges();
+                    //    }
+
+
+
+                    //    _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename);
+                    //}
+
+
+
+                }
+                //涓氬姟缁忕悊涓虹┖
+                if (true)
+                {
+                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null).ToList();
+                    for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++)
+                    {
+                        string conment = "{"
+                             + "\"appkey\": \"" + appkey + "\","
+                              + "\"senderId\": \"kehujingli\","
+                                 + "\"senderData\": { \"avatar\": \"\",\"name\": \"瀹㈡埛缁忕悊\"},"
+                                   + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+                                    + "\"type\": \"text\","
+                                     + "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
+                                       + "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒","
+                                       + "\"vendorOptions\": {\"huawei\": {\"category\": \"" + huawei + "\"},\"oppo\": {\"channel_id\": \"" + oppo + "\"},\"xiaomi\": {\"channel_id\": \"" + xiaomi + "\"},\"vivo\": {\"classification\":" + vivo + "}}"
+                                       + "}"
+                            + "}";
+
+                        string result2 = SMSHelper.PushAppduandu(conment);
+                        _logger.LogInformation("result2:" + result2);
+                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "200")
+                        {
+                            var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                            projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                            projectfasongxiaoxi.ProjectId = projectfasongxiaoxisywjl[i].ProjectId;
+                            projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId;
+                            projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing;
+                            projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei;
+                            projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl;
+                            projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname;
+                            projectfasongxiaoxi.RecStatus = "A";
+                            projectfasongxiaoxi.Createtime = DateTime.Now;
+                            _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+
+                        }
+                        _context.SaveChanges();
+                        _logger.LogInformation("鏃犱笟鍔＄粡鐞嗘帹閫乤pp缁欏鎴锋帹閫乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname);
+
+                    }
+
+                    //var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
+                    //int j = 0;
+                    //while (j * 1000 <= projectfasongxiaoxisywjl.Count)
+                    //{
+                    //    j = j + 1;
+                    //    string numberstring = "";
+                    //    string customename = "";
+                    //    if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
+                    //    {
+                    //        int countt = (j * 1000);
+                    //        if (countt > projectfasongxiaoxisywjl.Count)
+                    //        {
+                    //            countt = projectfasongxiaoxisywjl.Count;
+                    //        }
+
+                    //        for (int i = 0; i < countt; i++)
+                    //        {
+                    //            if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
+                    //            {
+                    //                continue;
+                    //            }
+                    //            numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
+                    //            customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
+
+                    //        }
+                    //    }
+
+                    //    if (numberstring.EndsWith(","))
+                    //    {
+                    //        numberstring = numberstring.Substring(0, numberstring.Length - 1);
+                    //    }
+                    //    if (string.IsNullOrEmpty(numberstring))
+                    //    {
+                    //        continue;
+                    //    }
+                    //    string conment = "{"
+                    //        + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒","
+                    //        + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
+                    //          + "\"getui_alias\": [" + numberstring + "],"
+                    //            + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \"},"
+                    //                + "\"force_notification\": true"
+                    //                + "}";
+
+                    //    string result2 = SMSHelper.PushApp(conment);
+                    //    _logger.LogInformation("result2:" + result2);
+                    //    JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                    //    if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
+                    //    {
+                    //        var isOK = jobjectresult["isOK"].ToString();
+
+                    //        foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                    //        {
+                    //            if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
+                    //            {
+                    //                var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                    //                projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                    //                projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
+                    //                projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
+                    //                projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
+                    //                projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
+                    //                projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
+                    //                projectfasongxiaoxi.RecStatus = "A";
+                    //                projectfasongxiaoxi.Createtime = DateTime.Now;
+                    //                _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+                    //            }
+                    //        }
+                    //        _context.SaveChanges();
+                    //    }
+
+
+
+                    //    _logger.LogInformation("鏃犱笟鍔＄粡鐞嗘帹閫乤pp缁欏鎴�" + customename);
+                    //}
+
+                }
+
+
+
+                
 
             }
             catch (Exception ex)
@@ -3266,10 +3727,10 @@
                             projectfasongxiaoxiDTO1.Ywjl = cooperatecustomCustomer.Ywjl;
                             projectfasongxiaoxiDTO1.KhId = cooperatecustomCustomer.Id;
                             projectfasongxiaoxiDTO1.HuiyuanId = cooperatecustomCustomer.HuiyuanId;
-                            projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
+                            //projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
 
                             //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛�
-                            var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id && x.Huiyuanid != cooperatecustomCustomer.HuiyuanId).ToList();
+                            var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == cooperatecustomCustomer.Id).ToList();
                             if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0)
                             {
                                 var huiyuanids = new List<Guid>();
@@ -3296,6 +3757,24 @@
                                         projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
                                         projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
                                         projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+                                        string name = "";
+                                        var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+                                        if (imUserInfo != null)
+                                        {
+                                            name = imUserInfo.NickName;
+                                        }
+                                        else
+                                        {
+                                            if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+                                            {
+                                                name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+                                            }
+                                            else
+                                            {
+                                                name = frameworkUser.Name;
+                                            }
+                                        }
+                                        projectfasongxiaoxiDTO.HuiyuanName = name;
                                         projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
                                     }
                                 }
@@ -3315,10 +3794,10 @@
                         projectfasongxiaoxiDTO1.Ywjl = intentionCustomer.Ywjl;
                         projectfasongxiaoxiDTO1.KhId = intentionCustomer.Id;
                         projectfasongxiaoxiDTO1.HuiyuanId = intentionCustomer.HuiyuanId;
-                        projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
+                        //projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO1);
 
                         //鏌ヨ璇ヤ紒涓氫笅鐨勫叾浠栦汉鍛�
-                        var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id && x.Huiyuanid != intentionCustomer.HuiyuanId).ToList();
+                        var customerGuanlianhuiyuansqita = customerGuanlianhuiyuans.Where(x => x.Customerid == intentionCustomer.Id).ToList();
                         if (customerGuanlianhuiyuansqita != null && customerGuanlianhuiyuansqita.Count > 0)
                         {
                             var huiyuanids = new List<Guid>();
@@ -3345,179 +3824,30 @@
                                     projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
                                     projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
                                     projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+                                    string name = "";
+                                    var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+                                    if (imUserInfo != null)
+                                    {
+                                        name = imUserInfo.NickName;
+                                    }
+                                    else
+                                    {
+                                        if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+                                        {
+                                            name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+                                        }
+                                        else
+                                        {
+                                            name = frameworkUser.Name;
+                                        }
+                                    }
+                                    projectfasongxiaoxiDTO.HuiyuanName = name;
                                     projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
                                 }
                             }
                         }
                     }
                 }
-
-
-                //鎺ㄩ�丄pp
-                foreach (var ywjl in Ywjl)
-                {
-
-                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList();
-                    int j = 0;
-                    while (j * 1000 <= projectfasongxiaoxisywjl.Count)
-                    {
-                        j = j + 1;
-                        string numberstring = "";
-                        string customename = "";
-                        if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
-                        {
-                            int countt = (j * 1000);
-                            if (countt > projectfasongxiaoxisywjl.Count)
-                            {
-                                countt = projectfasongxiaoxisywjl.Count;
-                            }
-
-                            for (int i = 0; i < countt; i++)
-                            {
-                                if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
-                                {
-                                    continue;
-                                }
-                                numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
-                                customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
-
-                            }
-                        }
-
-                        if (numberstring.EndsWith(","))
-                        {
-                            numberstring = numberstring.Substring(0, numberstring.Length - 1);
-                        }
-                        if (string.IsNullOrEmpty(numberstring))
-                        {
-                            continue;
-                        }
-                        string conment = "{"
-                            + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功\","
-                            + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
-                              + "\"getui_alias\": [" + numberstring + "],"
-                                + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"},"
-                                    + "\"force_notification\": true"
-                                    + "}";
-
-                        string result2 = SMSHelper.PushApp(conment);
-                        _logger.LogInformation("result2:" + result2);
-                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
-
-                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
-                        {
-                            var isOK = jobjectresult["isOK"].ToString();
-
-                            foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                            {
-                                if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
-                                {
-                                    var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                    projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                    projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
-                                    projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
-                                    projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
-                                    projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
-                                    projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
-                                    projectfasongxiaoxi.RecStatus = "A";
-                                    projectfasongxiaoxi.Createtime = DateTime.Now;
-                                    _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
-                                }
-                            }
-                            _context.SaveChanges();
-                        }
-
-
-
-                        _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename);
-                    }
-
-
-
-
-                }
-                //涓氬姟缁忕悊涓虹┖
-                if (true)
-                {
-                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
-                    int j = 0;
-                    while (j * 1000 <= projectfasongxiaoxisywjl.Count)
-                    {
-                        j = j + 1;
-                        string numberstring = "";
-                        string customename = "";
-                        if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
-                        {
-                            int countt = (j * 1000);
-                            if (countt > projectfasongxiaoxisywjl.Count)
-                            {
-                                countt = projectfasongxiaoxisywjl.Count;
-                            }
-                            for (int i = 0; i < countt; i++)
-                            {
-                                if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
-                                {
-                                    continue;
-                                }
-                                numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
-                                customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
-
-                            }
-                        }
-
-                        if (numberstring.EndsWith(","))
-                        {
-                            numberstring = numberstring.Substring(0, numberstring.Length - 1);
-                        }
-                        if (string.IsNullOrEmpty(numberstring))
-                        {
-                            continue;
-                        }
-                        string conment = "{"
-                            + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功\","
-                            + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
-                              + "\"getui_alias\": [" + numberstring + "],"
-                                + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \"},"
-                                    + "\"force_notification\": true"
-                                    + "}";
-
-                        string result2 = SMSHelper.PushApp(conment);
-                        _logger.LogInformation("result2:" + result2);
-                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
-
-                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
-                        {
-                            var isOK = jobjectresult["isOK"].ToString();
-
-                            foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
-                            {
-                                if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
-                                {
-                                    var projectfasongxiaoxi = new Projectfasongxiaoxi();
-                                    projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
-                                    projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
-                                    projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
-                                    projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
-                                    projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
-                                    projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
-                                    projectfasongxiaoxi.RecStatus = "A";
-                                    projectfasongxiaoxi.Createtime = DateTime.Now;
-                                    _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
-                                }
-                            }
-                            _context.SaveChanges();
-                        }
-
-
-
-                        _logger.LogInformation("鏃犱笟鍔＄粡鐞嗘帹閫乤pp缁欏鎴�" + customename);
-                    }
-
-
-
-                }
-
-
 
                 //鍙戦�佺煭淇�
                 foreach (var ywjl in Ywjl)
@@ -3649,6 +3979,251 @@
                         }
                     }
                 }
+
+                //鎺ㄩ�丄pp
+                foreach (var ywjl in Ywjl)
+                {
+                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id).ToList();
+                    for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++)
+                    {
+                        string conment = "{"
+                             + "\"appkey\": \"" + appkey + "\","
+                              + "\"senderId\": \"" + ywjl.UserSn + "\","
+                                 + "\"senderData\": { \"avatar\": \"\",\"name\": \"" + ywjl.UserName + "\"},"
+                                   + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+                                    + "\"type\": \"text\","
+                                     + "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + "  \","
+                                       + "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功 \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功 \","
+                                       + "\"vendorOptions\": {\"huawei\": {\"category\": \"" + huawei + "\"},\"oppo\": {\"channel_id\": \"" + oppo + "\"},\"xiaomi\": {\"channel_id\": \"" + xiaomi + "\"},\"vivo\": {\"classification\":" + vivo + "}}"
+                                       + "}"
+                            + "}";
+
+                        string result2 = SMSHelper.PushAppduandu(conment);
+                        _logger.LogInformation("result2:" + result2);
+                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "200")
+                        {
+                            var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                            projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                            projectfasongxiaoxi.ProjectId = projectfasongxiaoxisywjl[i].ProjectId;
+                            projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId;
+                            projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing;
+                            projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei;
+                            projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl;
+                            projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname;
+                            projectfasongxiaoxi.RecStatus = "A";
+                            projectfasongxiaoxi.Createtime = DateTime.Now;
+                            _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+
+                        }
+                        _context.SaveChanges();
+                        _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname);
+
+                    }
+
+                    //var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == ywjl.Id && x.Tel != null && x.Tel.StartsWith("1")).ToList();
+                    //int j = 0;
+                    //while (j * 1000 <= projectfasongxiaoxisywjl.Count)
+                    //{
+                    //    j = j + 1;
+                    //    string numberstring = "";
+                    //    string customename = "";
+                    //    if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
+                    //    {
+                    //        int countt = (j * 1000);
+                    //        if (countt > projectfasongxiaoxisywjl.Count)
+                    //        {
+                    //            countt = projectfasongxiaoxisywjl.Count;
+                    //        }
+
+                    //        for (int i = 0; i < countt; i++)
+                    //        {
+                    //            if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
+                    //            {
+                    //                continue;
+                    //            }
+                    //            numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
+                    //            customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
+
+                    //        }
+                    //    }
+
+                    //    if (numberstring.EndsWith(","))
+                    //    {
+                    //        numberstring = numberstring.Substring(0, numberstring.Length - 1);
+                    //    }
+                    //    if (string.IsNullOrEmpty(numberstring))
+                    //    {
+                    //        continue;
+                    //    }
+                    //    string conment = "{"
+                    //        + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功\","
+                    //        + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+                    //          + "\"getui_alias\": [" + numberstring + "],"
+                    //            + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \"},"
+                    //                + "\"force_notification\": true"
+                    //                + "}";
+
+                    //    string result2 = SMSHelper.PushApp(conment);
+                    //    _logger.LogInformation("result2:" + result2);
+                    //    JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                    //    if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
+                    //    {
+                    //        var isOK = jobjectresult["isOK"].ToString();
+
+                    //        foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                    //        {
+                    //            if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
+                    //            {
+                    //                var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                    //                projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                    //                projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
+                    //                projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
+                    //                projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
+                    //                projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
+                    //                projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
+                    //                projectfasongxiaoxi.RecStatus = "A";
+                    //                projectfasongxiaoxi.Createtime = DateTime.Now;
+                    //                _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+                    //            }
+                    //        }
+                    //        _context.SaveChanges();
+                    //    }
+
+
+
+                    //    _logger.LogInformation(ywjl.UserName + "鎺ㄩ�乤pp缁欏鎴�" + customename);
+                    //}
+
+
+
+
+                }
+                //涓氬姟缁忕悊涓虹┖
+                if (true)
+                {
+                    var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null).ToList();
+                    for (int i = 0; i < projectfasongxiaoxisywjl.Count; i++)
+                    {
+                        string conment = "{"
+                             + "\"appkey\": \"" + appkey + "\","
+                              + "\"senderId\": \"kehujingli\","
+                                 + "\"senderData\": { \"avatar\": \"\",\"name\": \"瀹㈡埛缁忕悊\"},"
+                                   + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+                                    + "\"type\": \"text\","
+                                     + "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
+                                       + "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功 \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功 \","
+                                       + "\"vendorOptions\": {\"huawei\": {\"category\": \"" + huawei + "\"},\"oppo\": {\"channel_id\": \"" + oppo + "\"},\"xiaomi\": {\"channel_id\": \"" + xiaomi + "\"},\"vivo\": {\"classification\":" + vivo + "}}"
+                                       + "}"
+                            + "}";
+
+                        string result2 = SMSHelper.PushAppduandu(conment);
+                        _logger.LogInformation("result2:" + result2);
+                        JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                        if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "200")
+                        {
+                            var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                            projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                            projectfasongxiaoxi.ProjectId = projectfasongxiaoxisywjl[i].ProjectId;
+                            projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoxisywjl[i].ProjectmingxiId;
+                            projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoxisywjl[i].Xiaoxileixing;
+                            projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoxisywjl[i].Xiaoxizhonglei;
+                            projectfasongxiaoxi.Gyszl = projectfasongxiaoxisywjl[i].Gyszl;
+                            projectfasongxiaoxi.Khname = projectfasongxiaoxisywjl[i].Khname;
+                            projectfasongxiaoxi.RecStatus = "A";
+                            projectfasongxiaoxi.Createtime = DateTime.Now;
+                            _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+
+                        }
+                        _context.SaveChanges();
+                        _logger.LogInformation("鏃犱笟鍔＄粡鐞嗘帹閫乤pp缁欏鎴锋帹閫乤pp缁欏鎴�" + projectfasongxiaoxisywjl[i].Khname);
+
+                    }
+
+                    //var projectfasongxiaoxisywjl = projectfasongxiaoxiDTOsappzuizhong.Where(x => x.Ywjl == null && x.Tel != null && x.Tel.StartsWith("1")).ToList();
+                    //int j = 0;
+                    //while (j * 1000 <= projectfasongxiaoxisywjl.Count)
+                    //{
+                    //    j = j + 1;
+                    //    string numberstring = "";
+                    //    string customename = "";
+                    //    if (projectfasongxiaoxisywjl != null && projectfasongxiaoxisywjl.Count > 0)
+                    //    {
+                    //        int countt = (j * 1000);
+                    //        if (countt > projectfasongxiaoxisywjl.Count)
+                    //        {
+                    //            countt = projectfasongxiaoxisywjl.Count;
+                    //        }
+                    //        for (int i = 0; i < countt; i++)
+                    //        {
+                    //            if (numberstring.IndexOf(projectfasongxiaoxisywjl[i + j - 1].Tel) >= 0)
+                    //            {
+                    //                continue;
+                    //            }
+                    //            numberstring += "\"" + projectfasongxiaoxisywjl[i + j - 1].Tel + "\",";
+                    //            customename += projectfasongxiaoxisywjl[i + j - 1].Khname + ",";
+
+                    //        }
+                    //    }
+
+                    //    if (numberstring.EndsWith(","))
+                    //    {
+                    //        numberstring = numberstring.Substring(0, numberstring.Length - 1);
+                    //    }
+                    //    if (string.IsNullOrEmpty(numberstring))
+                    //    {
+                    //        continue;
+                    //    }
+                    //    string conment = "{"
+                    //        + "\"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功\","
+                    //        + "\"content\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
+                    //          + "\"getui_alias\": [" + numberstring + "],"
+                    //            + "\"payload\": {\"text\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \"},"
+                    //                + "\"force_notification\": true"
+                    //                + "}";
+
+                    //    string result2 = SMSHelper.PushApp(conment);
+                    //    _logger.LogInformation("result2:" + result2);
+                    //    JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+                    //    if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
+                    //    {
+                    //        var isOK = jobjectresult["isOK"].ToString();
+
+                    //        foreach (var projectfasongxiaoDTO in projectfasongxiaoxisywjl)
+                    //        {
+                    //            if (isOK.IndexOf(projectfasongxiaoDTO.Tel) >= 0)
+                    //            {
+                    //                var projectfasongxiaoxi = new Projectfasongxiaoxi();
+                    //                projectfasongxiaoxi.Id = Guid.NewGuid().ToString();
+                    //                projectfasongxiaoxi.ProjectmingxiId = projectfasongxiaoDTO.ProjectmingxiId;
+                    //                projectfasongxiaoxi.Xiaoxileixing = projectfasongxiaoDTO.Xiaoxileixing;
+                    //                projectfasongxiaoxi.Xiaoxizhonglei = projectfasongxiaoDTO.Xiaoxizhonglei;
+                    //                projectfasongxiaoxi.Gyszl = projectfasongxiaoDTO.Gyszl;
+                    //                projectfasongxiaoxi.Khname = projectfasongxiaoDTO.Khname;
+                    //                projectfasongxiaoxi.RecStatus = "A";
+                    //                projectfasongxiaoxi.Createtime = DateTime.Now;
+                    //                _context.Projectfasongxiaoxis.Add(projectfasongxiaoxi);
+                    //            }
+                    //        }
+                    //        _context.SaveChanges();
+                    //    }
+
+
+
+                    //    _logger.LogInformation("鏃犱笟鍔＄粡鐞嗘帹閫乤pp缁欏鎴�" + customename);
+                    //}
+
+
+
+                }
+
+
+
+             
             }
             catch (Exception ex)
             {

--
Gitblit v1.9.1