Merge branch 'DuGuYang' into release

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();
         }
     }
 }

AppStart/RelationClassForConst.cs

@@ -153,6 +153,9 @@ namespace MySystem
                 case 127:
                     result = "运营中心分仓奖励";
                     break;
+                case 128:
+                    result = "合伙人(购机奖励)";
+                    break;
                 case 130:
                     result = "码牌激活奖励";
                     break;

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -246,8 +246,8 @@ namespace MySystem.Areas.Admin.Controllers
             // other.Add("ChangeTypeAmount124", ChangeTypeAmount124); //机具过期
             // other.Add("ChangeTypeAmount125", ChangeTypeAmount125); //软件服务费
 
-            string ChangeTypeAmount0 = "0.00", ChangeTypeAmount1 = "0.00", ChangeTypeAmount2 = "0.00", ChangeTypeAmount3 = "0.00", ChangeTypeAmount4 = "0.00", ChangeTypeAmount5 = "0.00", ChangeTypeAmount6 = "0.00", ChangeTypeAmount12 = "0.00", ChangeTypeAmount20 = "0.00", ChangeTypeAmount31 = "0.00", ChangeTypeAmount50 = "0.00", ChangeTypeAmount60 = "0.00", ChangeTypeAmount61 = "0.00", ChangeTypeAmount62 = "0.00", ChangeTypeAmount63 = "0.00", ChangeTypeAmount64 = "0.00", ChangeTypeAmount111 = "0.00", ChangeTypeAmount112 = "0.00", ChangeTypeAmount114 = "0.00", ChangeTypeAmount115 = "0.00", ChangeTypeAmount116 = "0.00", ChangeTypeAmount119 = "0.00", ChangeTypeAmount121 = "0.00", ChangeTypeAmount122 = "0.00", ChangeTypeAmount123 = "0.00", ChangeTypeAmount118And120 = "0.00", ChangeTypeAmount124 = "0.00", ChangeTypeAmount125 = "0.00", ChangeTypeAmount126 = "0.00", ChangeTypeAmount127 = "0.00", ChangeTypeAmount202 = "0.00", ChangeTypeAmount30 = "0.00";
-            DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)) + sum(if(ChangeType=12, ChangeAmount, 0)) + sum(if(ChangeType=133, ChangeAmount, 0)),sum(if(ChangeType=1 and ProductType!=101, ChangeAmount, 0)) + sum(if(ChangeType in(112,1) and ProductType=101, ChangeAmount, 0)),sum(if(ChangeType=2, ChangeAmount, 0)),sum(if(ChangeType=3, ChangeAmount, 0)),sum(if(ChangeType=4, ChangeAmount, 0)),sum(if(ChangeType=5, ChangeAmount, 0)),sum(if(ChangeType=6, ChangeAmount, 0)),sum(if(ChangeType=12, ChangeAmount, 0)),sum(if(ChangeType=20, ChangeAmount, 0)),sum(if(ChangeType=31 and (Remark!='开机抢红包活动' or Remark IS NULL), ChangeAmount, 0)),sum(if(ChangeType=50, ChangeAmount, 0)),sum(if(ChangeType=60, ChangeAmount, 0)),sum(if(ChangeType=61, ChangeAmount, 0)),sum(if(ChangeType=62, ChangeAmount, 0)),sum(if(ChangeType=63, ChangeAmount, 0)),sum(if(ChangeType=64, ChangeAmount, 0)),sum(if(ChangeType=111, ChangeAmount, 0)),sum(if(ChangeType=112  and ProductType=0, ChangeAmount, 0)),sum(if(ChangeType=114, ChangeAmount, 0)),sum(if(ChangeType=115, ChangeAmount, 0)),sum(if(ChangeType=116, ChangeAmount, 0)),sum(if(ChangeType=119, ChangeAmount, 0)),sum(if(ChangeType=121, ChangeAmount, 0)),sum(if(ChangeType=122, ChangeAmount, 0)),sum(if(ChangeType=123, ChangeAmount, 0)),sum(if(ChangeType in(118,120), ChangeAmount, 0)),sum(if(ChangeType=124, ChangeAmount, 0)),sum(if(ChangeType=125, ChangeAmount, 0)),sum(if(ChangeType=126, ChangeAmount, 0)),sum(if(ChangeType=127, ChangeAmount, 0)),sum(if(ChangeType=202, ChangeAmount, 0)),sum(if(ChangeType=31 and Remark='开机抢红包活动', ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
+            string ChangeTypeAmount0 = "0.00", ChangeTypeAmount1 = "0.00", ChangeTypeAmount2 = "0.00", ChangeTypeAmount3 = "0.00", ChangeTypeAmount4 = "0.00", ChangeTypeAmount5 = "0.00", ChangeTypeAmount6 = "0.00", ChangeTypeAmount12 = "0.00", ChangeTypeAmount20 = "0.00", ChangeTypeAmount31 = "0.00", ChangeTypeAmount50 = "0.00", ChangeTypeAmount60 = "0.00", ChangeTypeAmount61 = "0.00", ChangeTypeAmount62 = "0.00", ChangeTypeAmount63 = "0.00", ChangeTypeAmount64 = "0.00", ChangeTypeAmount111 = "0.00", ChangeTypeAmount112 = "0.00", ChangeTypeAmount114 = "0.00", ChangeTypeAmount115 = "0.00", ChangeTypeAmount116 = "0.00", ChangeTypeAmount119 = "0.00", ChangeTypeAmount121 = "0.00", ChangeTypeAmount122 = "0.00", ChangeTypeAmount123 = "0.00", ChangeTypeAmount118And120And128 = "0.00", ChangeTypeAmount124 = "0.00", ChangeTypeAmount125 = "0.00", ChangeTypeAmount126 = "0.00", ChangeTypeAmount127 = "0.00", ChangeTypeAmount202 = "0.00", ChangeTypeAmount30 = "0.00";
+            DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)) + sum(if(ChangeType=12, ChangeAmount, 0)) + sum(if(ChangeType=133, ChangeAmount, 0)),sum(if(ChangeType=1 and ProductType!=101, ChangeAmount, 0)) + sum(if(ChangeType in(112,1) and ProductType=101, ChangeAmount, 0)),sum(if(ChangeType=2, ChangeAmount, 0)),sum(if(ChangeType=3, ChangeAmount, 0)),sum(if(ChangeType=4, ChangeAmount, 0)),sum(if(ChangeType=5, ChangeAmount, 0)),sum(if(ChangeType=6, ChangeAmount, 0)),sum(if(ChangeType=12, ChangeAmount, 0)),sum(if(ChangeType=20, ChangeAmount, 0)),sum(if(ChangeType=31 and (Remark!='开机抢红包活动' or Remark IS NULL), ChangeAmount, 0)),sum(if(ChangeType=50, ChangeAmount, 0)),sum(if(ChangeType=60, ChangeAmount, 0)),sum(if(ChangeType=61, ChangeAmount, 0)),sum(if(ChangeType=62, ChangeAmount, 0)),sum(if(ChangeType=63, ChangeAmount, 0)),sum(if(ChangeType=64, ChangeAmount, 0)),sum(if(ChangeType=111, ChangeAmount, 0)),sum(if(ChangeType=112  and ProductType=0, ChangeAmount, 0)),sum(if(ChangeType=114, ChangeAmount, 0)),sum(if(ChangeType=115, ChangeAmount, 0)),sum(if(ChangeType=116, ChangeAmount, 0)),sum(if(ChangeType=119, ChangeAmount, 0)),sum(if(ChangeType=121, ChangeAmount, 0)),sum(if(ChangeType=122, ChangeAmount, 0)),sum(if(ChangeType=123, ChangeAmount, 0)),sum(if(ChangeType in(118,120,128), ChangeAmount, 0)),sum(if(ChangeType=124, ChangeAmount, 0)),sum(if(ChangeType=125, ChangeAmount, 0)),sum(if(ChangeType=126, ChangeAmount, 0)),sum(if(ChangeType=127, ChangeAmount, 0)),sum(if(ChangeType=202, ChangeAmount, 0)),sum(if(ChangeType=31 and Remark='开机抢红包活动', ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
             if (dt.Rows.Count > 0)
             {
                 ChangeTypeAmount0 = dt.Rows[0][0].ToString();
@@ -275,7 +275,7 @@ namespace MySystem.Areas.Admin.Controllers
                 ChangeTypeAmount121 = dt.Rows[0][22].ToString();
                 ChangeTypeAmount122 = dt.Rows[0][23].ToString();
                 ChangeTypeAmount123 = dt.Rows[0][24].ToString();
-                ChangeTypeAmount118And120 = dt.Rows[0][25].ToString();
+                ChangeTypeAmount118And120And128 = dt.Rows[0][25].ToString();
                 ChangeTypeAmount124 = dt.Rows[0][26].ToString();
                 ChangeTypeAmount125 = dt.Rows[0][27].ToString();
                 ChangeTypeAmount126 = dt.Rows[0][28].ToString();
@@ -308,7 +308,7 @@ namespace MySystem.Areas.Admin.Controllers
             other.Add("ChangeTypeAmount121", ChangeTypeAmount121); //运营中心奖励
             other.Add("ChangeTypeAmount122", ChangeTypeAmount122); //推荐大盟主奖励
             other.Add("ChangeTypeAmount123", ChangeTypeAmount123); //推荐小盟主奖励
-            other.Add("ChangeTypeAmount118And120", ChangeTypeAmount118And120); //购机奖励(118盟主奖励(购机奖励) 120运营中心(购机奖励))
+            other.Add("ChangeTypeAmount118And120", ChangeTypeAmount118And120And128); //购机奖励(118盟主奖励(购机奖励) 120运营中心(购机奖励) 128合伙人(购机奖励))
             other.Add("ChangeTypeAmount124", ChangeTypeAmount124); //扣机具货款
             other.Add("ChangeTypeAmount125", ChangeTypeAmount125); //软件服务费
             other.Add("ChangeTypeAmount126", ChangeTypeAmount126); //机具货款退还

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -92,7 +92,7 @@ namespace MySystem.Areas.Admin.Controllers
                 SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == Id) ?? new SysAdmin();
                 var userInfo = db.Users.FirstOrDefault(m => m.Id == sysAdmin.UserId) ?? new Models.Users();
                 if (userInfo.UserType == 0) dic["Kind"] = "";
-                if (userInfo.UserType == 1) dic["Kind"] = "普通合伙人";
+                if (userInfo.UserType == 1) dic["Kind"] = "运营中心";
                 if (userInfo.UserType == 2) dic["Kind"] = "黄金合伙人";
                 if (userInfo.UserType == 3) dic["Kind"] = "钻石合伙人";
                 if (userInfo.UserType == 4) dic["Kind"] = "战略合伙人";
@@ -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();
@@ -276,6 +289,10 @@ namespace MySystem.Areas.Admin.Controllers
                     return "创客编号和手机号不匹配";
                 }
             }
+            else
+            {
+                return data.MakerCode + "关联信息缺失";
+            }
 
             return "success";
         }

Areas/Admin/Views/MainServer/UserAccountRecord/Index.cshtml

@@ -126,6 +126,7 @@
                                 <option value="125">软件服务费</option>
                                 <option value="126">机具货款退还</option>
                                 <option value="127">运营中心分仓奖励</option>
+                                <option value="128">合伙人(购机奖励)</option>
                                 <option value="130">预发临时额度退还</option>
                                 <option value="131">码牌激活奖励</option>
                                 <option value="132">直营团队提现</option>

Areas/Admin/Views/OperateServer/SysAdminOperate/Add.cshtml

@@ -62,7 +62,7 @@
                                 <label class="layui-form-label">合伙人类型</label>
                                 <div class="layui-input-inline">
                                     <select id="Kind" name="Kind" lay-search="">
-                                        <option value="1" selected="selected">普通合伙人</option>
+                                        <option value="1" selected="selected">运营中心</option>
                                         <option value="2">黄金合伙人</option>
                                         <option value="3">钻石合伙人</option>
                                         <option value="4">战略合伙人</option>

Areas/Admin/Views/OperateServer/SysAdminOperate/Edit.cshtml

@@ -70,7 +70,7 @@
                                 <label class="layui-form-label">合伙人类型</label>
                                 <div class="layui-input-inline">
                                     <select id="Kind" name="Kind" lay-search="">
-                                        <option value="1">普通合伙人</option>
+                                        <option value="1">运营中心</option>
                                         <option value="2">黄金合伙人</option>
                                         <option value="3">钻石合伙人</option>
                                         <option value="4">战略合伙人</option>