调整大盟主新规逻辑

AppStart/Helper/AlipayPayBack2Service.cs

@@ -96,9 +96,10 @@ namespace MySystem
                         order = db.Orders.FirstOrDefault(m => m.Id == order.ParentOrderId && m.Status == 0);
                         if (order != null)
                         {
-                            order.Status = 1;
+                            order.Status = 2;
                             order.PayDate = DateTime.Now;
                             order.PayStatus = 1;
+                            OrderId = order.Id;
                         }
                     }
                 }
@@ -111,8 +112,12 @@ namespace MySystem
                 OrderProduct pro = db.OrderProduct.FirstOrDefault(m => m.OrderId == OrderId);
                 if (pro != null)
                 {
+                    if(order.ErpMode > 0)
+                    {
+                        pro.ProductId = order.ProductId;
+                    }
                     List<int> couponIds = new List<int>();
-                    if (pro.ProductId == 10 || pro.ProductId == 11 || pro.ProductId == 12 || pro.ProductId == 13)
+                    if (pro.ProductId == 10 || pro.ProductId == 11 || pro.ProductId == 27 || pro.ProductId == 28)
                     {
                         order.Status = 2;
                         int BuyCount = pro.ProductCount;
@@ -125,7 +130,7 @@ namespace MySystem
                         {
                             Kind = 2;
                         }
-                        else if (pro.ProductId == 12)
+                        else if (pro.ProductId == 28)
                         {
                             Users user = db.Users.FirstOrDefault(m => m.Id == order.UserId);
                             if(user != null)
@@ -133,7 +138,7 @@ namespace MySystem
                                 user.LeaderLevel = 1;
                             }
                         }
-                        else if (pro.ProductId == 13)
+                        else if (pro.ProductId == 27)
                         {
                             Users user = db.Users.FirstOrDefault(m => m.Id == order.UserId);
                             if(user != null)
@@ -141,7 +146,7 @@ namespace MySystem
                                 user.LeaderLevel = 2;
                             }
                         }
-                        if(Kind <= 2)
+                        if(Kind <= 2 && pro.ProductId == 10 || pro.ProductId == 11)
                         {
                             string Codes = "";
                             var coupons = db.PosCoupons.Where(m => m.IsLock == 0 && m.IsUse == 0 && m.UserId == 0 && m.QueryCount == Kind).OrderBy(m => m.Id).Take(BuyCount).ToList();
@@ -160,7 +165,7 @@ namespace MySystem
                             order.SnNos = Codes.TrimEnd(',');
                         }
                         db.SaveChanges();
-                        if (pro.ProductId == 12 || pro.ProductId == 13)
+                        if (pro.ProductId == 27 || pro.ProductId == 28)
                         {
                             //充值盟主储备金
                             OpReserve(db, order, order.UserId, order.TotalPrice, 1);
@@ -274,14 +279,17 @@ namespace MySystem
                 {
                     if(order.ProductId > 0 && order.ErpMode > 0)
                     {
-                        //盟主储备金-升级/购买
-                        if(order.ErpMode == 2)
+                        //盟主储备金-升级/购买 ErpMode:1-升级，2-购买
+                        if(order.ErpMode > 0)
                         {
                             Users user = db.Users.FirstOrDefault(m => m.Id == order.UserId);
                             if(user != null)
                             {
-                                user.LeaderLevel = 2;
-                                db.SaveChanges();
+                                if(order.ErpMode == 1)
+                                {
+                                    user.LeaderLevel = 2;
+                                    db.SaveChanges();
+                                }
                                 OpReserve(db, order, order.UserId, order.TotalPrice, 1);
                             }
                         }

AppStart/Helper/BalancePayBackService.cs

@@ -59,7 +59,7 @@ namespace MySystem
                     TotalPrice = 0.01M;
                 }
                 string ProductName = "";
-                List<OrderProduct> orderPros = db.OrderProduct.Where(m=>m.OrderId == OrderId).ToList();
+                List<OrderProduct> orderPros = db.OrderProduct.Where(m => m.OrderId == OrderId).ToList();
                 foreach(OrderProduct orderPro in orderPros)
                 {
                     ProductName += orderPro.ProductName + ",";

Startup.cs

@@ -92,7 +92,7 @@ namespace MySystem
 
             // services.AddHostedService<TimerStatTimer>(); //实时统计创客、激活商户数
             // services.AddHostedService<PosTradeStatTimer>(); // 统计头天的交易额、商户型创客、激活奖励、开机奖励
-            // services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
+            services.AddHostedService<AlipayPayBack2Timer>(); //支付宝回调处理
 
             //services.AddHttpContextAccessor();
 
@@ -203,9 +203,10 @@ namespace MySystem
             // RedPackageHelper.Instance.Start(); //每天生成300个红包
             // RedPackageHelper.Instance.StartStatTop10(); //红包活动统计排行
             // RedPackageHelper.Instance.StartSendPrize(); //红包活动发奖
-            // BalancePayBackService.Instance.Start(); //余额支付队列
-            // LeaderPrizeService.Instance.Start(); //大盟主奖励发奖
-            // MessageCenterService.Instance.Start(); // 消息队列
+            BalancePayBackService.Instance.Start(); //余额支付队列
+            ReservePayBackService.Instance.Start(); //储备金支付队列
+            LeaderPrizeService.Instance.Start(); //大盟主奖励发奖
+            MessageCenterService.Instance.Start(); // 消息队列
             //必须打开的
 
             // StatService.Instance.StartPosActNum(); //实时统计激活数