调整

Areas/Admin/Controllers/MainServer/PosCouponsController.cs

@@ -66,7 +66,7 @@ namespace MySystem.Areas.Admin.Controllers
                 var sysAdmins = opdb.SysAdmin.FirstOrDefault(m => m.OpCode == OpCode) ?? new OpModels.SysAdmin();
                 if (sysAdmins.Id > 0)
                 {
-                    condition = " and OpId=" + sysAdmins.Id;
+                    condition = " and OpId=" + sysAdmins.UserId;
                 }
             }
             //创客编号
@@ -151,7 +151,7 @@ namespace MySystem.Areas.Admin.Controllers
 
                 //所属运营中心
                 int OpId = int.Parse(dic["OpId"].ToString());
-                var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == OpId) ?? new OpModels.SysAdmin();
+                var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.UserId == OpId) ?? new OpModels.SysAdmin();
                 if (sysAdmin.Id > 0)
                 {
                     dic["YName"] = sysAdmin.OpCode;

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具库列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(PosMachinesTwo data, string BindingStateSelect, string ActivationStateSelect, string UserIdMakerCode, string UserIdRealName, string StoreIdCode, string StoreIdName, string BrandId, string ActivationDateData, string BindingDateData, string IsStoreSelect, int ShowFlag = 0, int page = 1, int limit = 30)
+        public JsonResult IndexData(PosMachinesTwo data, string BindingStateSelect, string ActivationStateSelect, string UserIdMakerCode, string UserIdRealName, string StoreIdCode, string StoreIdName, string BrandId, string ActivationDateData, string BindingDateData, string IsStoreSelect, string OpCode, int ShowFlag = 0, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -112,6 +112,15 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdName + "')";
             }
+            //运营中心编号
+            if (!string.IsNullOrEmpty(OpCode))
+            {
+                var sysUser = opdb.SysAdmin.FirstOrDefault(m => m.OpCode == OpCode) ?? new OpModels.SysAdmin();
+                if (sysUser.Id > 0)
+                {
+                    condition += " and OpId=" + sysUser.UserId;
+                }
+            }
             //品牌
             if (!string.IsNullOrEmpty(BrandId))
             {
@@ -210,6 +219,14 @@ namespace MySystem.Areas.Admin.Controllers
                 string PrizeParams = dic["PrizeParams"].ToString();
                 dic["PrizeParams"] = PrizeParams;
 
+                //所属运营中心
+                int OpId = int.Parse(dic["OpId"].ToString());
+                if (OpId != 0)
+                {
+                    var sys = opdb.SysAdmin.FirstOrDefault(m => m.UserId == OpId) ?? new OpModels.SysAdmin();
+                    dic["OpCode"] = sys.OpCode;
+                }
+
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
             int TotalCount = 0;//总机具数

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -1509,6 +1509,7 @@ namespace MySystem.Areas.Admin.Controllers
                             query = opdb.StoreForOperate.Add(new OpModels.StoreForOperate()
                             {
                                 CreateDate = DateTime.Now, //创建时间
+                                Sort = storeInfo.UserId,//分仓所属人Id
                                 SeoTitle = user.MakerCode,
                                 SeoKeyword = storeInfo.StoreNo + "_" + storeInfo.StoreName,
                                 OpId = sysAdmin.UserId,

Areas/Admin/Controllers/OperateServer/StoreMachineApplyOperateController.cs

@@ -71,12 +71,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客编号
             if (!string.IsNullOrEmpty(MakerCode))
             {
-                condition += " and Id in (select Id from SysAdmin where MakerCode='" + MakerCode + "')";
+                condition += " and UserId in (select UserId from SysAdmin where MakerCode='" + MakerCode + "')";
             }
             //运营中心编号
             if (!string.IsNullOrEmpty(OpCode))
             {
-                condition += " and Id in (select Id from SysAdmin where OpCode='" + OpCode + "')";
+                condition += " and UserId in (select UserId from SysAdmin where OpCode='" + OpCode + "')";
             }
 
             if (!string.IsNullOrEmpty(StatusSelect))
@@ -96,8 +96,8 @@ namespace MySystem.Areas.Admin.Controllers
                 if (Status == 1) dic["StatusName"] = "已发货";
                 if (Status == 2) dic["StatusName"] = "已驳回";
                 //创客
-                int OpId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
-                SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == OpId) ?? new SysAdmin();
+                int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
+                SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.UserId == UserId) ?? new SysAdmin();
                 dic["MakerName"] = sysAdmin.MakerName;
                 dic["MakerCode"] = sysAdmin.MakerCode;
                 dic["OpCode"] = sysAdmin.OpCode;
@@ -153,12 +153,12 @@ namespace MySystem.Areas.Admin.Controllers
             //创客编号
             if (!string.IsNullOrEmpty(MakerCode))
             {
-                condition += " and Id in (select Id from SysAdmin where MakerCode='" + MakerCode + "')";
+                condition += " and UserId in (select UserId from SysAdmin where MakerCode='" + MakerCode + "')";
             }
             //运营中心编号
             if (!string.IsNullOrEmpty(OpCode))
             {
-                condition += " and Id in (select Id from SysAdmin where OpCode='" + OpCode + "')";
+                condition += " and UserId in (select UserId from SysAdmin where OpCode='" + OpCode + "')";
             }
 
             if (!string.IsNullOrEmpty(StatusSelect))
@@ -178,8 +178,8 @@ namespace MySystem.Areas.Admin.Controllers
                 if (Status == 1) dic["StatusName"] = "已发货";
                 if (Status == 2) dic["StatusName"] = "已驳回";
                 //创客
-                int OpId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
-                SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == OpId) ?? new SysAdmin();
+                int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
+                SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.UserId == UserId) ?? new SysAdmin();
                 dic["MakerName"] = sysAdmin.MakerName;
                 dic["MakerCode"] = sysAdmin.MakerCode;
                 dic["OpCode"] = sysAdmin.OpCode;
@@ -814,6 +814,9 @@ namespace MySystem.Areas.Admin.Controllers
                         //修改机具所属仓库
                         machine.StoreId = tostore.Id;
                         machine.UpdateDate = DateTime.Now;
+
+                        //添加机具所属运营中心
+                        machine.OpId = tostore.UserId;
                     }
                 }
                 else

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -69,7 +69,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             Fields.Add("RealName", "2"); //名称
 
-            string condition = " and Status>-1 and AdminName!='admin";
+            string condition = " and Status>-1 and AdminName!='admin'";
             //运营中心编号
             if (!string.IsNullOrEmpty(OpCode))
             {
@@ -212,6 +212,7 @@ namespace MySystem.Areas.Admin.Controllers
                             Sort = edit.Id,//所属运营中心
                             CreateMan = SysUserName + "_" + SysRealName,
                             Details = "运营中心管理员，可以操作运营中心所有权限",
+                            RightInfo = ",1_1,1_1_1,1_1_1_edit,1_2,1_2_1,1_2_1_export,1_3,1_3_1,1_3_1_base,1_4,1_4_1,1_4_1_add,1_4_2,1_4_2_add,1_6,1_6_1,1_6_1_add,1_6_1_delete,1_6_1_edit,1_6_2,1_6_2_add,1_6_2_delete,1_6_2_edit,",
                             Name = "运营中心管理员",
 
                         }).Entity;
@@ -300,6 +301,16 @@ namespace MySystem.Areas.Admin.Controllers
                 var userInfo = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId && m.Mobile == data.MakerMobile) ?? new Models.Users();
                 if (userInfo.Id > 0)
                 {
+                    var check = opdb.SysAdmin.Any(m => m.AdminName == data.AdminName);
+                    var checks = opdb.SysAdmin.Any(m => m.UserId == userInfo.Id);
+                    if (check)
+                    {
+                        return "该用户名已存在，请重新输入";
+                    }
+                    if (checks)
+                    {
+                        return "该用户已存在运营中心，请重新输入";
+                    }
                     Fields.Add("RealName", data.RealName); //运营中心名称
                     Fields.Add("MakerCode", data.MakerCode); //创客编号
                     Fields.Add("MakerMobile", data.MakerMobile); //手机号
@@ -308,7 +319,11 @@ namespace MySystem.Areas.Admin.Controllers
                     Fields.Add("MakerName", userInfo.RealName); //创客真实姓名
                     if (!string.IsNullOrEmpty(data.Password)) //密码不为空就修改密码，否则不操作
                     {
-                        Fields.Add("Password", function.MD5_32(data.Password)); //密码
+                        var sys = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
+                        if (data.Password != sys.Password)
+                        {
+                            Fields.Add("Password", function.MD5_32(data.Password)); //密码
+                        }
                     }
                     Fields.Add("FilePath", data.FilePath); //附件
                     Field.Add("TotalAmt", userAccount.TotalAmt); //初始额度

Areas/Admin/Controllers/OperateServer/UserCashRecordOperateController.cs

@@ -73,7 +73,7 @@ namespace MySystem.Areas.Admin.Controllers
             //运营中心编号
             if (!string.IsNullOrEmpty(OpCode))
             {
-                condition += " and UserId in (select Id from SysAdmin where OpCode='" + OpCode + "')";
+                condition += " and UserId in (select UserId from SysAdmin where OpCode='" + OpCode + "')";
             }
             //提现状态
             if (!string.IsNullOrEmpty(StatusSelect))
@@ -143,8 +143,8 @@ namespace MySystem.Areas.Admin.Controllers
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-                int OpId = int.Parse(dic["UserId"].ToString());
-                SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == OpId) ?? new SysAdmin();
+                int UserId = int.Parse(dic["UserId"].ToString());
+                SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.UserId == UserId) ?? new SysAdmin();
                 dic["OpCode"] = sysAdmin.OpCode;
                 dic["MakerCode"] = sysAdmin.MakerCode;
                 dic["RealName"] = sysAdmin.MakerName;
@@ -486,7 +486,11 @@ namespace MySystem.Areas.Admin.Controllers
             //运营中心编号
             if (!string.IsNullOrEmpty(OpCode))
             {
-                condition += " and UserId in (select Id from SysAdmin where OpCode='" + OpCode + "')";
+                var sysUser = opdb.SysAdmin.FirstOrDefault(m => m.OpCode == OpCode) ?? new OpModels.SysAdmin();
+                if (sysUser.Id > 0)
+                {
+                    condition += " and OpId=" + sysUser.UserId;
+                }
             }
             //提现状态
             if (!string.IsNullOrEmpty(StatusSelect))
@@ -508,8 +512,8 @@ namespace MySystem.Areas.Admin.Controllers
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-                int OpId = int.Parse(dic["UserId"].ToString());
-                SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == OpId) ?? new SysAdmin();
+                int UserId = int.Parse(dic["UserId"].ToString());
+                SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.UserId == UserId) ?? new SysAdmin();
                 var user = db.Users.FirstOrDefault(m => m.Id == sysAdmin.UserId) ?? new Models.Users();
                 dic["OpCode"] = sysAdmin.OpCode;
                 dic["MakerCode"] = sysAdmin.MakerCode;

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

@@ -69,6 +69,12 @@
                             <input class="layui-input" type="text" name="StoreIdName" autocomplete="off">
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">运营中心编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="OpCode" autocomplete="off">
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">是否仓库机</label>
                         <div class="layui-input-inline">

Areas/Admin/Views/OperateServer/UserCashRecordOperate/Index.cshtml

@@ -112,7 +112,7 @@
                             <button class="layui-btn" data-type="ExportExcel"><i
                                 class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
                         }
-                        @if (RightInfo.Contains("," + right + "_import,"))
+                        @if (RightInfo.Contains("," + right + "_export,"))
                         {
                             <button class="layui-btn" data-type="ImportData"><i
                                 class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>提现结果导入</button>

wwwroot/layuiadmin/modules_main/PosMachinesTwo_Admin.js

@@ -145,6 +145,7 @@ layui.config({
             , { field: 'RecycStartDate', width: 200, title: '循环开始时间', sort: true }
             , { field: 'RecycEndDate', width: 200, title: '循环截止时间', sort: true }
             , { field: 'UserInfo', width: 200, title: '大盟主券标记', sort: true }
+            , { field: 'OpCode', width: 200, title: '所属运营中心', sort: true }
             , { field: 'IsFirst', width: 200, title: '是否第一台机具', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '实际押金金额', sort: true }
             , { field: 'PrizeParams', width: 200, title: '设置押金金额', sort: true }
@@ -257,7 +258,7 @@ layui.config({
     form.on('submit(LAY-list-front-search)', function (data) {
         var field = data.field;
         field.ShowFlag = 1;
-        if (field.UserIdMakerCode == "" && field.UserIdRealName == "" && field.StoreIdCode == "" && field.StoreIdName == "" && field.PosSn == "" && field.BindingStateSelect == "" && field.ActivationStateSelect == "" && field.ActivationDateData == "" && field.BindingDateData == "" && field.BrandId == "") {
+        if (field.UserIdMakerCode == "" && field.UserIdRealName == "" && field.StoreIdCode == "" && field.StoreIdName == "" && field.PosSn == "" && field.BindingStateSelect == "" && field.ActivationStateSelect == "" && field.ActivationDateData == "" && field.BindingDateData == "" && field.BrandId == "" && field.IsStoreSelect == "" && field.OpCode == "") {
             layer.alert('请输入查询条件');
         }
         else {

wwwroot/layuiadmin/modules_operate/StoreMachineApplys_Admin.js

@@ -108,7 +108,7 @@ layui.config({
             , { field: 'MakerName', width: 150, title: '创客姓名', sort: true }
             , { field: 'MakerCode', width: 150, title: '创客编号', sort: true }
             , { field: 'OpCode', width: 150, title: '运营中心编号', sort: true }
-            , { title: '操作', align: 'center', width: 500, fixed: 'right', toolbar: '#table-list-tools' }
+            // , { title: '操作', align: 'center', width: 500, fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {