修复机具所属人字段，buyuserid改为userid

AppStart/Helper/AlipayPayBack2Service.cs

@@ -197,7 +197,6 @@ namespace MySystem
                                             if (machineCount + ActiveCount + couponCount >= 3)
                                             {
                                                 function.WriteLog("满足条件", "推荐下单奖励监控日志");
-                                                function.WriteLog("\r\n\r\n", "推荐下单奖励监控日志");
                                                 UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == ParentUserId);
                                                 if (account == null)
                                                 {
@@ -255,6 +254,7 @@ namespace MySystem
                                         }
                                     }
                                 }
+                                function.WriteLog("\r\n\r\n", "推荐下单奖励监控日志");
                             }
                         }
                     }

AppStart/Helper/StatService.cs

@@ -316,7 +316,7 @@ namespace MySystem
                                 {
                                     ActPrize = 300;
                                 }
-                                Users machineUser = db.Users.FirstOrDefault(m => m.Id == pos.UserId) ?? new Users();
+                                Users machineUser = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId) ?? new Users();
                                 db.ActiveReward.Add(new ActiveReward()
                                 {
                                     CreateDate = DateTime.Now,
@@ -455,7 +455,7 @@ namespace MySystem
                 MachineForMerNo forMerNo = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == merchant.MerchantNo) ?? new MachineForMerNo();
                 PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == forMerNo.SnId) ?? new PosMachinesTwo();
                 string ParentNav = "";
-                Users user = db.Users.FirstOrDefault(m => m.Id == pos.UserId);
+                Users user = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId);
                 if (user != null)
                 {
                     int GetUserId = user.Id;
@@ -487,7 +487,7 @@ namespace MySystem
                             {
                                 ActPrize = 300;
                             }
-                            Users machineUser = db.Users.FirstOrDefault(m => m.Id == pos.UserId) ?? new Users();
+                            Users machineUser = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId) ?? new Users();
                             db.ActiveReward.Add(new ActiveReward()
                             {
                                 CreateDate = DateTime.Now,
@@ -636,8 +636,8 @@ namespace MySystem
                                             Users puser = db.Users.FirstOrDefault(m => m.Id == UserId && m.AuthFlag == 1);
                                             if (puser != null && Prize > 0)
                                             {
-                                                int machineCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.PosSnType == 0); //判断是否拥有3台购买机
-                                                int ActiveCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.ActivationState == 1); //判断是否拥有3台激活机（不限购买或赠送）
+                                                int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.PosSnType == 0); //判断是否拥有3台购买机
+                                                int ActiveCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.ActivationState == 1); //判断是否拥有3台激活机（不限购买或赠送）
                                                 int couponCount = db.PosCoupons.Count(m => m.UserId == puser.Id && m.IsUse == 0); //判断是否拥有3张券
                                                 // int BigCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.BrandId == 3); //判断是否拥有2台大机
                                                 // int BigActiveCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.ActivationState == 1 && m.BrandId == 3); //判断是否拥有2台激活大机（不限购买或赠送）
@@ -648,7 +648,7 @@ namespace MySystem
                                                     {
                                                         pTopUserId = int.Parse(puser.ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
                                                     }
-                                                    Users machineUser = db.Users.FirstOrDefault(m => m.Id == pos.UserId) ?? new Users();
+                                                    Users machineUser = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId) ?? new Users();
                                                     OpenRewardDetail detail = db.OpenRewardDetail.Add(new OpenRewardDetail()
                                                     {
                                                         CreateDate = DateTime.Now,
@@ -801,7 +801,7 @@ namespace MySystem
                         //     otherInfo.PrizeFlag2 = 1;
                         //     db.SaveChanges();
                         // 从机具所属人上级开始分开机奖励
-                        Users user = db.Users.FirstOrDefault(m => m.Id == pos.UserId);
+                        Users user = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId);
                         if (user != null)
                         {
                             if (!string.IsNullOrEmpty(user.ParentNav))
@@ -826,7 +826,7 @@ namespace MySystem
                                             {
                                                 pTopUserId = int.Parse(puser.ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
                                             }
-                                            Users machineUser = db.Users.FirstOrDefault(m => m.Id == pos.UserId) ?? new Users();
+                                            Users machineUser = db.Users.FirstOrDefault(m => m.Id == pos.BuyUserId) ?? new Users();
                                             OpenRewardDetail detail = db.OpenRewardDetail.Add(new OpenRewardDetail()
                                             {
                                                 CreateDate = DateTime.Now,

Controllers/HomeController.cs

@@ -69,8 +69,7 @@ namespace MySystem.Controllers
         }
 
         public string setqrcode(int uid = 0)
-        {
-            
+        {            
             return "ok";
         }