85天费率通知调整

AppStart/Helper/SetDepositService.cs

@@ -56,6 +56,7 @@ namespace MySystem
                             List<int> mids = poslist.Select(m => m.BindMerchantId).ToList();
                             List<PosMerchantInfo> merchantlist = db.PosMerchantInfo.Where(m => mids.Contains(m.Id)).ToList();
                             Dictionary<int, List<PosMachinesTwo>> userPosList = new Dictionary<int, List<PosMachinesTwo>>();
+                            Dictionary<int, List<PosMachinesTwo>> hintPosList = new Dictionary<int, List<PosMachinesTwo>>();
                             foreach(PosMachinesTwo pos in poslist)
                             {
                                 PosMerchantInfo merchant = merchantlist.FirstOrDefault(m => m.Id == pos.BindMerchantId);
@@ -64,10 +65,11 @@ namespace MySystem
                                     decimal Fee = Kind == 1 ? 0.63M : 0.6M;
                                     if(Kind == 0)
                                     {
-                                        pos.UpFeeFlag = 1;
-                                        pos.UpFeeMan = OpMan;
-                                        pos.UpFeeDate = DateTime.Now;
-                                        merchant.Status = 1;
+                                        pos.UserNav = "85天调升提醒";
+                                        // pos.UpFeeFlag = 1;
+                                        // pos.UpFeeMan = OpMan;
+                                        // pos.UpFeeDate = DateTime.Now;
+                                        // merchant.Status = 1;
                                         // merchant.SeoKeyword = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                                     }
                                     else if(Kind == 1)
@@ -107,6 +109,19 @@ namespace MySystem
                                     }
                                     db.SaveChanges();
                                     pos.QueryCount = Kind;
+                                    if(Kind == 0) //85天调升提醒
+                                    {
+                                        if(hintPosList.ContainsKey(pos.BuyUserId))
+                                        {
+                                            hintPosList[pos.BuyUserId].Add(pos);
+                                        }
+                                        else
+                                        {
+                                            List<PosMachinesTwo> subPos = new List<PosMachinesTwo>();
+                                            subPos.Add(pos);
+                                            hintPosList.Add(pos.BuyUserId, subPos);
+                                        }
+                                    }
                                     if(Kind > 0) //只有调降发消息
                                     {
                                         if(userPosList.ContainsKey(pos.BuyUserId))
@@ -126,6 +141,52 @@ namespace MySystem
                                     }
                                 }
                             }
+                            foreach(int UserId in hintPosList.Keys)
+                            {
+                                string snhtml = "", snhtml2 = "";
+                                foreach (var item in hintPosList[UserId])
+                                {
+                                    var mer = merchantlist.FirstOrDefault(m => m.Id == item.BindMerchantId) ?? new PosMerchantInfo();
+                                    var brand = brands.FirstOrDefault(m => m.Id == item.BrandId) ?? new KqProducts();
+                                    if(item.BrandId == 12 || item.BrandId == 13)
+                                    {
+                                        snhtml2 += "<div style='margin-bottom: .48rem;'><div class='f16'>商户姓名：" + mer.MerRealName + "</div>";
+                                        snhtml2 += "<div class='f16'>机具品牌：" + brand.Name + "</div>";
+                                        snhtml2 += "<div class='f16'>SN：" + item.PosSn + "</div>";
+                                    }
+                                    else
+                                    {
+                                        snhtml += "<div style='margin-bottom: .48rem;'><div class='f16'>商户姓名：" + mer.MerRealName + "</div>";
+                                        snhtml += "<div class='f16'>机具品牌：" + brand.Name + "</div>";
+                                        snhtml += "<div class='f16'>SN：" + item.PosSn + "</div>";
+                                    }
+                                    string DownFeeDate = item.DownFeeDate == null ? "" : item.DownFeeDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                                }
+                                if(!string.IsNullOrEmpty(snhtml))
+                                {
+                                    snhtml = "<div style='margin-bottom: .48rem;'>" + snhtml + "</div>";
+                                    RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                                    {
+                                        UserId = Convert.ToInt32(UserId), //创客
+                                        Title = "机具费率即将调升提醒", //标题
+                                        Content = "<div class='f16' style='margin-bottom: .72rem'>您的部分机具已绑定满85天，5天后该机具刷卡费率将恢复0.63+3，如需调整费率，请前往我的商户-商户详情中点击调整</div>" + snhtml, //内容
+                                        Summary = "您的部分机具已绑定满85天，5天后该机具刷卡费率将恢复0.63+3，如需调整费率，请前往我的商户-商户详情中点击调整",
+                                        CreateDate = DateTime.Now,
+                                    }));
+                                }
+                                if(!string.IsNullOrEmpty(snhtml2))
+                                {
+                                    snhtml2 = "<div style='margin-bottom: .48rem;'>" + snhtml2 + "</div>";
+                                    RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                                    {
+                                        UserId = Convert.ToInt32(UserId), //创客
+                                        Title = "机具费率即将调升提醒", //标题
+                                        Content = "<div class='f16' style='margin-bottom: .72rem'>您的部分机具已绑定满85天，5天后该机具刷卡费率将恢复0.63，如需调整费率，请前往我的商户-商户详情中点击调整</div>" + snhtml2, //内容
+                                        Summary = "您的部分机具已绑定满85天，5天后该机具刷卡费率将恢复0.63，如需调整费率，请前往我的商户-商户详情中点击调整",
+                                        CreateDate = DateTime.Now,
+                                    }));
+                                }
+                            }
                             foreach(int UserId in userPosList.Keys)
                             {
                                 string snhtml = "", snhtml2 = "";
@@ -160,14 +221,6 @@ namespace MySystem
                                 if(!string.IsNullOrEmpty(snhtml))
                                 {
                                     snhtml = "<div style='margin-bottom: .48rem;'>" + snhtml + "</div>";
-                                    // RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
-                                    // {
-                                    //     UserId = Convert.ToInt32(UserId), //创客
-                                    //     Title = "商户费率变更通知", //标题
-                                    //     Content = "<div class='f16' style='margin-bottom: .72rem'>您的部分机具已绑定超过180天，刷卡费率已自动变更为0.63%，如需调整费率，请前往我的商户-商户详情中调整费率</div>" + snhtml, //内容
-                                    //     Summary = "您的部分机具已绑定超过180天，刷卡费率已自动变更为0.63%，如需调整费率，请前往我的商户-商户详情中调整费率",
-                                    //     CreateDate = DateTime.Now,
-                                    // }));
                                     RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
                                     {
                                         UserId = Convert.ToInt32(UserId), //创客

AppStart/Helper/SetFeeFlagService.cs

@@ -53,7 +53,7 @@ namespace MySystem
                                     foreach (var item in posList)
                                     {
                                         function.WriteLog(item.Id.ToString(), "85天提前通知创客费率调升");
-                                        string info = "{\"RecordId\":\"\",\"PosId\":\"" + item.Id + "\",\"Fee\": \"" + 0.63 + "\",\"Kind\": \"0\",\"OpMan\": \""+"系统"+"\"}";
+                                        string info = "{\"RecordId\":\"\",\"PosId\":\"" + item.Id + "\",\"Fee\": \"" + 0.63 + "\",\"Kind\": \"0\",\"OpMan\": \"" + "系统" + "\"}";
                                         RedisDbconn.Instance.AddList("SetDepositQueue", info);
                                         StartId = item.Id;
                                     }