乐刷海科兑换盒易付的机具，不再发放50元的奖励，限制时间，8月1号之前的机具还是要发

AppStart/Helper/StatService.cs

@@ -465,44 +465,44 @@ namespace MySystem
                         {
                             doActiveReward(db, merchant, pos, GetUserId, ParentNav, TopUserId, 50);
                         }
-                        // if(pos.IsFirst == 0 && pos.CreditTrade >= 1000)
-                        // {
-                        //     string IdCard = merchant.MerIdcardNo;
-                        //     string IdCardStart = IdCard.Substring(0, 6);
-                        //     string IdCardEnd = IdCard.Substring(IdCard.Length - 4);
-                        //     string MerName = merchant.MerchantName;
-                        //     List<int> BrandIds = new List<int>();
-                        //     BrandIds.Add(4);
-                        //     BrandIds.Add(5);
-                        //     BrandIds.Add(8);
-                        //     BrandIds.Add(9);
-                        //     PosMerchantInfo other = db.PosMerchantInfo.FirstOrDefault(m => m.MerIdcardNo.StartsWith(IdCardStart) && m.MerIdcardNo.EndsWith(IdCardEnd) && m.MerchantName.Contains(MerName) && BrandIds.Contains(m.BrandId));
-                        //     if(other != null)
-                        //     {
-                        //         PosMachinesTwo checkpos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == other.KqSnNo && m.IsFirst == 1);
-                        //         if(checkpos != null)
-                        //         {
-                        //             doActiveReward(db, merchant, pos, GetUserId, ParentNav, TopUserId, 50);
-                        //             PosMachinesTwo edit = db.PosMachinesTwo.FirstOrDefault(m => m.Id == pos.Id);
-                        //             if(edit != null)
-                        //             {
-                        //                 edit.SeoKeyword = checkpos.SeoKeyword;
-                        //                 edit.UpFeeFlag = checkpos.UpFeeFlag;
-                        //                 edit.DownFeeFlag = checkpos.DownFeeFlag;
-                        //                 edit.UpFeeDate = checkpos.UpFeeDate;
-                        //                 edit.DownFeeDate = checkpos.DownFeeDate;
-                        //                 edit.BindingTime = checkpos.BindingTime;
-                        //                 edit.IsFirst = checkpos.IsFirst;
-                        //                 db.SaveChanges();
-                        //                 if(edit.UpFeeFlag == 1 && edit.DownFeeFlag == 0)
-                        //                 {
-                        //                     string info = "{\"RecordId\":\"\",\"PosId\":\"" + edit.Id + "\",\"Fee\": \"0.63\",\"Kind\": \"1\",\"OpMan\": \"系统\"}";
-                        //                     RedisDbconn.Instance.AddList("SetDepositPostQueue", info);
-                        //                 }
-                        //             }
-                        //         }
-                        //     }
-                        // }
+                        if(pos.IsFirst == 0 && pos.CreditTrade >= 1000 && pos.ActivationState == 1 && pos.ActivationTime < DateTime.Parse("2023-08-01 00:00:00"))
+                        {
+                            string IdCard = merchant.MerIdcardNo;
+                            string IdCardStart = IdCard.Substring(0, 6);
+                            string IdCardEnd = IdCard.Substring(IdCard.Length - 4);
+                            string MerName = merchant.MerchantName;
+                            List<int> BrandIds = new List<int>();
+                            BrandIds.Add(4);
+                            BrandIds.Add(5);
+                            BrandIds.Add(8);
+                            BrandIds.Add(9);
+                            PosMerchantInfo other = db.PosMerchantInfo.FirstOrDefault(m => m.MerIdcardNo.StartsWith(IdCardStart) && m.MerIdcardNo.EndsWith(IdCardEnd) && m.MerchantName.Contains(MerName) && BrandIds.Contains(m.BrandId));
+                            if(other != null)
+                            {
+                                PosMachinesTwo checkpos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == other.KqSnNo && m.IsFirst == 1);
+                                if(checkpos != null)
+                                {
+                                    doActiveReward(db, merchant, pos, GetUserId, ParentNav, TopUserId, 50);
+                                    PosMachinesTwo edit = db.PosMachinesTwo.FirstOrDefault(m => m.Id == pos.Id);
+                                    if(edit != null)
+                                    {
+                                        edit.SeoKeyword = checkpos.SeoKeyword;
+                                        edit.UpFeeFlag = checkpos.UpFeeFlag;
+                                        edit.DownFeeFlag = checkpos.DownFeeFlag;
+                                        edit.UpFeeDate = checkpos.UpFeeDate;
+                                        edit.DownFeeDate = checkpos.DownFeeDate;
+                                        edit.BindingTime = checkpos.BindingTime;
+                                        edit.IsFirst = checkpos.IsFirst;
+                                        db.SaveChanges();
+                                        if(edit.UpFeeFlag == 1 && edit.DownFeeFlag == 0)
+                                        {
+                                            string info = "{\"RecordId\":\"\",\"PosId\":\"" + edit.Id + "\",\"Fee\": \"0.63\",\"Kind\": \"1\",\"OpMan\": \"系统\"}";
+                                            RedisDbconn.Instance.AddList("SetDepositPostQueue", info);
+                                        }
+                                    }
+                                }
+                            }
+                        }
                         PosMachinesTwo item = db.PosMachinesTwo.FirstOrDefault(m => m.Id == pos.Id);
                         if(item != null)
                         {