调整开机奖励起始创客

AppStart/Helper/StatService.cs

@@ -196,7 +196,11 @@ namespace MySystem
                 int MerchantTypeUserId = int.Parse(function.CheckInt(pos.SeoTitle));
                 if (MerchantTypeUserId > 0)
                 {
-                    UserId = MerchantTypeUserId;
+                    Users merchantUser = db.Users.FirstOrDefault(m => m.Id == MerchantTypeUserId && m.MerchantType == 1);
+                    if (merchantUser != null)
+                    {
+                        UserId = MerchantTypeUserId;
+                    }
                 }
                 RedisDbconn.Instance.AddNumber("MerTotalAmount:" + MerchantId, TradeAmount);
                 RedisDbconn.Instance.AddNumber("MerTotalAmount:" + MerchantId + ":" + TradeMonth, TradeAmount); //商户当月交易
@@ -442,14 +446,16 @@ namespace MySystem
                         PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
                         if (merchant != null)
                         {
-                            Users user = db.Users.FirstOrDefault(m => m.Id == merchant.UserId);
-                            if (user != null)
-                            {
-                                if (user.MerchantType == 1)
-                                {
-                                    user = db.Users.FirstOrDefault(m => m.Id == user.ParentUserId);
-                                }
-                            }
+                            // 从机具所属人上级开始分开机奖励
+                            Users user = db.Users.FirstOrDefault(m => m.Id == pos.UserId);
+                            // Users user = db.Users.FirstOrDefault(m => m.Id == merchant.UserId);
+                            // if (user != null)
+                            // {
+                            //     if (user.MerchantType == 1)
+                            //     {
+                            //         user = db.Users.FirstOrDefault(m => m.Id == user.ParentUserId);
+                            //     }
+                            // }
                             if (user != null)
                             {
                                 if (!string.IsNullOrEmpty(user.ParentNav))
@@ -462,7 +468,7 @@ 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 machineCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.PosSnType == 0); //判断是否拥有3台购买机
                                             if (machineCount >= 3)
                                             {
                                                 int pTopUserId = 0;