Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1165,6 +1165,8 @@ namespace MySystem.Areas.Admin.Controllers
             string ActiveTime = reward.CreateDate == null ? "" : reward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string ActiveTime6 = lisreward.CreateDate == null ? "" : lisreward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string result = "";
+            result += "机器持有人顶级：创客编号：" + posTopUser.MakerCode + "，姓名：" + posTopUser.RealName + "\n";
+            result += "\n";
             result += "机具SN：" + pos.PosSn + "\n";
             result += "商户编号：" + merInfo + "，商户姓名：" + merName + "\n";
             result += "商户型机器/直拓机器：创客编号：" + posSubUser.MakerCode + "，姓名：" + posSubUser.RealName + "，手机号：" + posSubUser.Mobile + "\n";
@@ -1173,7 +1175,7 @@ namespace MySystem.Areas.Admin.Controllers
                 result += "换机来源机具SN：" + change.BackSnNo + "\n";
             }
             result += "机具所属人：创客编号：" + posUser.MakerCode + "，姓名：" + posUser.RealName + "，手机号：" + posUser.Mobile + "\n";
-            result += "机器持有人顶级：创客编号：" + posTopUser.MakerCode + "，姓名：" + posTopUser.RealName + "，手机号：" + posTopUser.Mobile + "\n";
+            // result += "机器持有人顶级：创客编号：" + posTopUser.MakerCode + "，姓名：" + posTopUser.RealName + "，手机号：" + posTopUser.Mobile + "\n";
             result += "机器所属仓库：仓库编号：" + store.StoreNo + "，仓库名称：" + store.StoreName + "\n";
             if (pos.PreUserId > 0)
             {
@@ -3588,7 +3590,6 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                pos.UpdateDate = DateTime.Now;
                 pos.BindMerchantId = posMerchant.Id;
                 db.SaveChanges();
                 function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + query + ":" + SysUserName + "-" + SysRealName, "根据机具号、商户号、商户姓名关联");
@@ -3682,41 +3683,28 @@ namespace MySystem.Areas.Admin.Controllers
                 return "请输入划拨对象创客编号";
             }
             var query = PosSn + "," + FromMakerCode + "," + ToMakerCode;
-            var user = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == FromMakerCode) ?? new UserForMakerCode();
-            var tuser = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == ToMakerCode) ?? new UserForMakerCode();
-            var fUserId = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
-            var tUserId = db.Users.FirstOrDefault(m => m.Id == tuser.UserId) ?? new Users();
             var machineForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == PosSn) ?? new MachineForSnNo();
-            var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId && m.BuyUserId == user.UserId) ?? new PosMachinesTwo();
+            var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId) ?? new PosMachinesTwo();
             if (posInfo.Id == 0)
             {
                 return "机具" + PosSn + "不存在";
             }
+            var user = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == FromMakerCode) ?? new UserForMakerCode();
+            var tuser = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == ToMakerCode) ?? new UserForMakerCode();
+            var fUserId = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
             if (fUserId.Id == 0)
             {
                 return "来源创客" + FromMakerCode + "不存在";
             }
+            var tUserId = db.Users.FirstOrDefault(m => m.Id == tuser.UserId) ?? new Users();
             if (tUserId.Id == 0)
             {
                 return "划拨创客" + ToMakerCode + "不存在";
             }
             if (posInfo.BindingState == 0)
             {
-                if (posInfo.UserId == 0 || posInfo.BuyUserId == posInfo.UserId)
-                {
-                    posInfo.BuyUserId = tUserId.Id;
-                    posInfo.UserId = tUserId.Id;
-                }
-                else
-                {
-                    posInfo.BuyUserId = tUserId.Id;
-                }
-                var fUserPos = db.UserMachineData.FirstOrDefault(m => m.IdBrand == fUserId.Id + "_" + posInfo.BrandId) ?? new UserMachineData();
-                var tUserPos = db.UserMachineData.FirstOrDefault(m => m.IdBrand == tUserId.Id + "_" + posInfo.BrandId) ?? new UserMachineData();
-                fUserPos.TotalMachineCount -= 1;
-                fUserPos.UnBindCount -= 1;
-                tUserPos.TotalMachineCount += 1;
-                tUserPos.UnBindCount += 1;
+                posInfo.BuyUserId = tUserId.Id;
+                posInfo.UserId = tUserId.Id;
                 db.SaveChanges();
                 function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + query + ":" + SysUserName + "-" + SysRealName, "划拨创客机具");
             }
@@ -3747,7 +3735,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "请输入提现订单编号";
             }
-            string[] OrderNoList = OrderNo.Replace("\r", "").Split('\n');
+            string[] OrderNoList = OrderNo.Replace("\r","").Split('\n');
             var error = "";
             foreach (var item in OrderNoList)
             {

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -1057,7 +1057,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and ParentUserId=" + ParentId;
             }
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Users", Fields, "Id desc", "True", 1, 20000, condition, "ParentUserId,ParentNav,UserLevel,SettleAmount,CashFreezeAmt,CertId,Mobile,MerchantType,MerchantDate,AuthFlag,RiskFlag,CreateDate", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Users", Fields, "Id desc", "True", 1, 20000, condition, "MakerCode,RealName,ParentUserId,ParentNav,UserLevel,SettleAmount,CashFreezeAmt,CertId,Mobile,MerchantType,MerchantDate,AuthFlag,RiskFlag,CreateDate", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {

wwwroot/layuiadmin/modules_main/UserAccount_Admin.js

@@ -112,6 +112,8 @@ layui.config({
                 { field: 'ValidPreAmount', width: 110, title: '可用预发额度' ,sort: true},
                 { field: 'AccountStatusName', width: 110, title: '账户状态' ,sort: true},
                 { field: 'SeoDescription', width: 100, title: '备注' ,sort: true},
+                { field: 'LeaderReserve', width: 100, title: '盟主储蓄金' ,sort: true},
+                { field: 'LeaderBalanceAmount', width: 100, title: '盟主可提现余额' ,sort: true},
                 // { field: 'CreateDate', width: 200, title: '创建时间' ,sort: true},
                 { field: 'UpdateDate', width: 160, title: '冻结/解冻时间' ,sort: true},
                 { field: 'UpdateMan', width: 160, title: '操作信息' ,sort: true},