Ver código fonte

运营中心过期不发奖励

lcl 1 ano atrás
pai
commit
5547dfbd4b

+ 8 - 8
AppStart/Helper/OperatePrizeService.cs

@@ -44,9 +44,9 @@ namespace MySystem
                                 while(UserId > 0)
                                 {
                                     Users user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
-                                    // OpModels.SysAdmin sys = spdb.SysAdmin.FirstOrDefault(m => m.UserId == user.Id) ?? new OpModels.SysAdmin();
-                                    // if(user.UserType >= 1 && sys.ExpireDate > DateTime.Now)
-                                    // {
+                                    OpModels.SysAdmin sys = spdb.SysAdmin.FirstOrDefault(m => m.UserId == user.Id) ?? new OpModels.SysAdmin();
+                                    if(user.UserType >= 1 && sys.ExpireDate > DateTime.Now)
+                                    {
                                         if(user.UserType >= 1)
                                         {
                                             OpId = user.Id;
@@ -56,11 +56,11 @@ namespace MySystem
                                         {
                                             UserId = user.ParentUserId;
                                         }
-                                    // }
-                                    // else
-                                    // {
-                                    //     UserId = 0;
-                                    // }
+                                    }
+                                    else
+                                    {
+                                        UserId = 0;
+                                    }
                                 }
                                 if(OpId > 0)
                                 {

+ 4 - 4
AppStart/Helper/PosCouponPrize/PosCouponPrizeService.cs

@@ -395,12 +395,12 @@ namespace MySystem
                 dic.LeaderLevel = leader.LeaderLevel;
             }
             dic.AgoLeaderLevel = leader.LeaderLevel;
-            // OpModels.SysAdmin sys = opdb.SysAdmin.FirstOrDefault(m => m.UserId == UserId) ?? new OpModels.SysAdmin();
-            // if(sys.ExpireDate > now)
-            // {
+            OpModels.SysAdmin sys = opdb.SysAdmin.FirstOrDefault(m => m.UserId == UserId) ?? new OpModels.SysAdmin();
+            if(sys.ExpireDate > now)
+            {
                 dic.OperateLevel = user.UserType;
                 dic.UserType = user.UserType;
-            // }
+            }
             dic.MerchantType = user.MerchantType;
             dic.Id = user.Id;
             dic.MakerCode = user.MakerCode;

+ 6 - 6
AppStart/Helper/StatService.cs

@@ -1215,12 +1215,12 @@ namespace MySystem
                                                                 leaderOp = db.Leaders.Any(m => m.Id == puser.Id && m.ExpiredDate >= now);
                                                                 function.WriteLog("条件:leaderOp:" + leaderOp, "开机奖励发放日志");
                                                             }
-                                                            // else if(puser.LeaderLevel == 0 && puser.UserType > 0)
-                                                            // {
-                                                            //     DateTime now = DateTime.Now;
-                                                            //     leaderOp = opdb.SysAdmin.Any(m => m.UserId == puser.Id && m.ExpireDate >= now);
-                                                            //     function.WriteLog("条件:2-leaderOp:" + leaderOp, "盟主开机奖励发放日志");
-                                                            // }
+                                                            else if(puser.LeaderLevel == 0 && puser.UserType > 0)
+                                                            {
+                                                                DateTime now = DateTime.Now;
+                                                                leaderOp = opdb.SysAdmin.Any(m => m.UserId == puser.Id && m.ExpireDate >= now);
+                                                                function.WriteLog("条件:2-leaderOp:" + leaderOp, "盟主开机奖励发放日志");
+                                                            }
                                                             if(leaderOp)
                                                             {
                                                                 function.WriteLog("满足条件", "开机奖励发放日志");

+ 2 - 1
AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -360,7 +360,8 @@ namespace MySystem
                                             decimal deposit = decimal.Parse(function.CheckNum(pos.SeoKeyword));
                                             if (deposit > 0)
                                             {
-                                                PxcModels.TradeRecord chk = db.TradeRecord.FirstOrDefault(m => m.SnNo == pos.PosSn);
+                                                int SftStartId = RedisDbconn.Instance.Get<int>("SftTradeChkId");
+                                                PxcModels.TradeRecord chk = db.TradeRecord.FirstOrDefault(m => m.Id > SftStartId && m.SnNo == pos.PosSn);
                                                 if(chk == null)
                                                 {
                                                     TradeAmount -= deposit;