Merge branch 'feat-lcl-训练营' into release-mainserver

AppStart/Helper/LeaderApplyCouponsHelper.cs

@@ -165,7 +165,7 @@ namespace MySystem
                         if(PosCouponPrizeService.Instance.CheckOpReserve(opdb, groupCount, parentUser.Id))
                         {
                             //购机奖
-                            decimal CurBuyPrize = GetBuyPrize(parentUser);
+                            decimal CurBuyPrize = GetBuyPrize(parentUser, query.UserId);
                             decimal GetPrize = CurBuyPrize - BuyPrize;
                             int Kind = 0;
                             if(query.Remark == "兑换机具券")
@@ -221,7 +221,7 @@ namespace MySystem
                         if(PosCouponPrizeService.Instance.CheckOpReserve(opdb, groupCount, parentUser.Id))
                         {
                             //购机奖
-                            decimal CurBuyPrize = GetBuyPrize(parentUser);
+                            decimal CurBuyPrize = GetBuyPrize(parentUser, query.UserId);
                             decimal GetPrize = CurBuyPrize - BuyPrize;
                             int Kind = 0;
                             if(query.Remark == "兑换机具券")
@@ -246,9 +246,20 @@ namespace MySystem
         /// </summary>
         /// <param name="user"></param>
         /// <returns></returns>
-        public decimal GetBuyPrize(UserRankItem user)
+        public decimal GetBuyPrize(UserRankItem user, int UserId = 0)
         {
-            if(user.OperateLevel == 2) return 60;
+            if(user.OperateLevel == 2) 
+            {
+                if(PosCouponPrizeService.Instance.TradeTeamCheck2(user.Id))
+                {
+                    return 60;
+                }
+                if(!PosCouponPrizeService.Instance.TradeTeamCheck(UserId))
+                {
+                    return 0;
+                }
+                return 60;
+            }
             if(user.OperateLevel == 3) return 80;
             if(user.OperateLevel == 4) return 100;
             return 0;

AppStart/Helper/PosCouponPrize/PosCouponPrizeService.cs

@@ -1075,6 +1075,10 @@ namespace MySystem
             if(user.OperateLevel == 1) return 100;
             if(user.OperateLevel == 2) 
             {
+                if(TradeTeamCheck2(user.Id))
+                {
+                    return 160;
+                }
                 if(!TradeTeamCheck(OrderUserId))
                 {
                     return 100;
@@ -1097,8 +1101,8 @@ namespace MySystem
             function.WriteLog("UserId:" + UserId, "训练营判断参与活动");
             WebCMSEntities maindb = new WebCMSEntities();
             Users muser = maindb.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
-            string ParentNav = muser.ParentNav + "," + UserId + ",";
-            string[] ParentNavList = ParentNav.Replace(",,", ",").Trim(',').Split(',');
+            string ParentNav = muser.ParentUserId + "," + UserId;
+            string[] ParentNavList = ParentNav.Split(',');
             List<int> UserIds = new List<int>();
             foreach(string IdString in ParentNavList)
             {
@@ -1124,6 +1128,33 @@ namespace MySystem
             return op;
         }
 
+        public bool TradeTeamCheck2(int UserId)
+        {
+            bool op = false;
+            if(UserId == 0)
+            {
+                return op;
+            }
+            function.WriteLog("黄金合伙人-UserId:" + UserId, "训练营判断参与活动");
+            JavaModels.WebCMSEntities db = new JavaModels.WebCMSEntities();
+            var users = db.KxsCampUser.Where(m => m.UserId == UserId).ToList();
+            foreach(var user in users)
+            {
+                DateTime now = DateTime.Now;
+                // JavaModels.KxsCamp camp = db.KxsCamp.FirstOrDefault(m => m.Id == user.CampId && m.StartTime <= now && m.EndTime >= now);
+                JavaModels.KxsCamp camp = db.KxsCamp.FirstOrDefault(m => m.Id == user.CampId && m.Status == 1);
+                if(camp != null)
+                {
+                    function.WriteLog("黄金合伙人-活动Id:" + camp.Id, "训练营判断参与活动");
+                    op = true;
+                    break;
+                }
+            }
+            db.Dispose();
+            function.WriteLog("\n\n\n", "训练营判断参与活动");
+            return op;
+        }
+
         /// <summary>
         /// 获取可提现金额
         /// </summary>

Controllers/HomeController.cs

@@ -168,147 +168,6 @@ namespace MySystem.Controllers
 
         public string test()
         {
-            WebCMSEntities db = new WebCMSEntities();
-            List<string> list = new List<string>();
-            foreach(string sub in list)
-            {
-                string[] subData = sub.Split(';');
-                string OrderNo = subData[0].Split(':')[1];
-                int ToUserId = int.Parse(subData[1].Split(':')[1]);
-                int UserId = int.Parse(subData[2].Split(':')[1]);
-                decimal Amt = decimal.Parse(subData[3].Split(':')[1]);
-                UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == UserId) ?? new UserAccount();
-                if(account.BalanceAmount - account.FreezeAmount >= Amt)
-                {
-                    account.BalanceAmount -= Amt;
-                    account.TotalAmount -= Amt;
-                    Orders order = db.Orders.FirstOrDefault(m => m.OrderNo == OrderNo) ?? new Orders();
-                    UserAccountRecord record = db.UserAccountRecord.FirstOrDefault(m => m.QueryCount == order.Id && m.ChangeType == 112 && m.ChangeAmount == Amt && m.UserId == UserId);
-                    if(record != null)
-                    {
-                        record.UserId = ToUserId;
-                        UserAccount toAccount = db.UserAccount.FirstOrDefault(m => m.Id == ToUserId);
-                        if(toAccount != null)
-                        {
-                            toAccount.BalanceAmount += Amt;
-                            toAccount.TotalAmount += Amt;
-                            db.SaveChanges();
-
-                            // //重置实发对象收支明细数据
-                            // var oldrecord = db.UserAccountRecord.Where(m => m.Id < record.Id && m.UserId == UserId).OrderByDescending(m => m.Id).FirstOrDefault();
-                            // if(oldrecord != null)
-                            // {
-                            //     decimal AfterBalanceAmount = oldrecord.AfterBalanceAmount;
-                            //     decimal AfterTotalAmount = oldrecord.AfterTotalAmount;
-                            //     decimal AfterFreezeAmount = oldrecord.AfterFreezeAmount;
-                            //     var records = db.UserAccountRecord.Where(m => m.Id > oldrecord.Id && m.UserId == UserId).OrderBy(m => m.Id).ToList();
-                            //     foreach(var subrecord in records)
-                            //     {
-                            //         UserAccountRecord edit = db.UserAccountRecord.FirstOrDefault(m => m.Id == subrecord.Id);
-                            //         if(edit != null)
-                            //         {
-                            //             if(edit.BeforeBalanceAmount < edit.AfterBalanceAmount)
-                            //             {
-                            //                 edit.AfterBalanceAmount = AfterBalanceAmount + edit.ChangeAmount;
-                            //             }
-                            //             else
-                            //             {
-                            //                 edit.AfterBalanceAmount = AfterBalanceAmount - edit.ChangeAmount;
-                            //             }
-
-                            //             if(edit.BeforeTotalAmount < edit.AfterTotalAmount)
-                            //             {
-                            //                 edit.AfterTotalAmount = AfterTotalAmount + edit.ChangeAmount;
-                            //             }
-                            //             else
-                            //             {
-                            //                 edit.AfterTotalAmount = AfterTotalAmount - edit.ChangeAmount;
-                            //             }
-
-                            //             if(edit.BeforeFreezeAmount < edit.AfterFreezeAmount)
-                            //             {
-                            //                 edit.AfterFreezeAmount = AfterFreezeAmount + edit.ChangeAmount;
-                            //             }
-                            //             else
-                            //             {
-                            //                 edit.AfterFreezeAmount = AfterFreezeAmount - edit.ChangeAmount;
-                            //             }
-                            //             edit.BeforeBalanceAmount = AfterBalanceAmount;
-                            //             edit.BeforeTotalAmount = AfterTotalAmount;
-                            //             edit.BeforeFreezeAmount = AfterFreezeAmount;
-                            //             db.SaveChanges();
-
-                            //             AfterBalanceAmount = edit.AfterBalanceAmount;
-                            //             AfterTotalAmount = edit.AfterTotalAmount;
-                            //             AfterFreezeAmount = edit.AfterFreezeAmount;
-                            //         }
-                            //     }
-                            // }
-
-                            // //重置实发对象收支明细数据
-                            // var torecord = db.UserAccountRecord.Where(m => m.Id < record.Id && m.UserId == ToUserId).OrderByDescending(m => m.Id).FirstOrDefault();
-                            // if(torecord != null)
-                            // {
-                            //     record.BeforeBalanceAmount = torecord.AfterBalanceAmount;
-                            //     record.BeforeTotalAmount = torecord.AfterTotalAmount;
-                            //     record.BeforeFreezeAmount = torecord.AfterFreezeAmount;
-                            //     record.AfterBalanceAmount = record.BeforeBalanceAmount + record.ChangeAmount;
-                            //     record.AfterTotalAmount = record.BeforeTotalAmount + record.ChangeAmount;
-                            //     record.AfterFreezeAmount = record.BeforeFreezeAmount + record.ChangeAmount;
-
-                            //     decimal AfterBalanceAmount = record.AfterBalanceAmount;
-                            //     decimal AfterTotalAmount = record.AfterTotalAmount;
-                            //     decimal AfterFreezeAmount = record.AfterFreezeAmount;
-                            //     var records = db.UserAccountRecord.Where(m => m.Id > torecord.Id && m.UserId == ToUserId).OrderBy(m => m.Id).ToList();
-                            //     foreach(var subrecord in records)
-                            //     {
-                            //         UserAccountRecord edit = db.UserAccountRecord.FirstOrDefault(m => m.Id == subrecord.Id);
-                            //         if(edit != null)
-                            //         {
-                            //             if(edit.BeforeBalanceAmount < edit.AfterBalanceAmount)
-                            //             {
-                            //                 edit.AfterBalanceAmount = AfterBalanceAmount + edit.ChangeAmount;
-                            //             }
-                            //             else
-                            //             {
-                            //                 edit.AfterBalanceAmount = AfterBalanceAmount - edit.ChangeAmount;
-                            //             }
-
-                            //             if(edit.BeforeTotalAmount < edit.AfterTotalAmount)
-                            //             {
-                            //                 edit.AfterTotalAmount = AfterTotalAmount + edit.ChangeAmount;
-                            //             }
-                            //             else
-                            //             {
-                            //                 edit.AfterTotalAmount = AfterTotalAmount - edit.ChangeAmount;
-                            //             }
-
-                            //             if(edit.BeforeFreezeAmount < edit.AfterFreezeAmount)
-                            //             {
-                            //                 edit.AfterFreezeAmount = AfterFreezeAmount + edit.ChangeAmount;
-                            //             }
-                            //             else
-                            //             {
-                            //                 edit.AfterFreezeAmount = AfterFreezeAmount - edit.ChangeAmount;
-                            //             }
-                            //             edit.BeforeBalanceAmount = AfterBalanceAmount;
-                            //             edit.BeforeTotalAmount = AfterTotalAmount;
-                            //             edit.BeforeFreezeAmount = AfterFreezeAmount;
-                            //             db.SaveChanges();
-
-                            //             AfterBalanceAmount = edit.AfterBalanceAmount;
-                            //             AfterTotalAmount = edit.AfterTotalAmount;
-                            //             AfterFreezeAmount = edit.AfterFreezeAmount;
-                            //         }
-                            //     }
-                            // }
-
-                            function.WriteLog(sub, "已执行日志");
-                        }
-                    }
-                }
-            }
-            db.Dispose();
             return "ok";
         }