Merge branch 'feature-dgy-合伙人标记和盟主或运营中心' into feature-dgy-后台测试

AppStart/Helper/TimeOutPosChargeService.cs

@@ -113,7 +113,7 @@ namespace MySystem
                 WebCMSEntities db = new WebCMSEntities();
                 DoChargeAmount(db);
                 db.Dispose();
-                Thread.Sleep(600000);
+                Thread.Sleep(60000);
             }
         }
 
@@ -140,6 +140,7 @@ namespace MySystem
 
         public void DoChargeAmount(WebCMSEntities db, int UserId = 0)
         {
+            MySystem.OpModels.WebCMSEntities opdb = new MySystem.OpModels.WebCMSEntities();
             IQueryable<ToChargeBackRecord> list = db.ToChargeBackRecord.Where(m => m.Status == 0);//过期机具扣费记录
             if (UserId > 0)
             {
@@ -216,7 +217,7 @@ namespace MySystem
                             {
                                 CreateDate = DateTime.Now, //创建时间
                                 Sort = 12,
-                                UserId = UserId, //创客
+                                UserId = items.UserId, //创客
                                 Remark = "盟主预扣款",
                                 ChangeType = 2,//变动类型(1 增加 2 减少)
                                 BeforeAmt = userAccount.LeaderBalanceAmount,
@@ -238,7 +239,6 @@ namespace MySystem
                 }
                 else //运营中心
                 {
-                    MySystem.OpModels.WebCMSEntities opdb = new MySystem.OpModels.WebCMSEntities();
                     var opUserAccount = opdb.UserAccount.FirstOrDefault(m => m.Id == items.UserId) ?? new MySystem.OpModels.UserAccount();
                     if (opUserAccount.ValidForGetAmount >= record.ChargeAmount)
                     {
@@ -247,7 +247,7 @@ namespace MySystem
                             var amoutRecord = opdb.AmountRecord.Add(new MySystem.OpModels.AmountRecord
                             {
                                 CreateDate = DateTime.Now,
-                                UserId = UserId,
+                                UserId = items.UserId,
                                 SeoDescription = "运营中心预扣款",
                                 UseAmount = record.ChargeAmount,
                                 OperateType = 2,
@@ -282,6 +282,7 @@ namespace MySystem
                 function.WriteLog("\n\n", "扣款监听日志");
             }
             db.SaveChanges();
+            opdb.SaveChanges();
         }
     }
 }

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -230,6 +230,19 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                     }
                     userInfo.UserType = int.Parse(Kind);//设置创客为运营中心
+                    //添加合伙人预设职级记录
+                    var operatorRankWhite = db.OperatorRankWhite.FirstOrDefault(m => m.Id == userInfo.Id) ?? new Models.OperatorRankWhite();
+                    if (operatorRankWhite.Id == 0)
+                    {
+                        operatorRankWhite = db.OperatorRankWhite.Add(new Models.OperatorRankWhite()
+                        {
+                            Id = userInfo.Id,
+                            CreateDate = DateTime.Now,
+                            UpdateDate = DateTime.Now.AddMonths(12),
+                            Rank = 9,
+                            UserId = userInfo.Id,
+                        }).Entity;
+                    }
                     db.SaveChanges();
 
                     var kqProduct = db.KqProducts.ToList();