调整

Areas/Admin/Controllers/MainServer/PosCouponsController.cs

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

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -223,7 +223,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int OpId = int.Parse(dic["OpId"].ToString());
                 if (OpId != 0)
                 {
-                    var sys = opdb.SysAdmin.FirstOrDefault(m => m.UserId == OpId) ?? new OpModels.SysAdmin();
+                    var sys = opdb.SysAdmin.FirstOrDefault(m => m.QueryCount > 0 && m.UserId == OpId) ?? new OpModels.SysAdmin();
                     dic["OpCode"] = sys.OpCode;
                 }
 

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -156,7 +156,7 @@ namespace MySystem.Areas.Admin.Controllers
                 var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.OpCode == YZOpCode) ?? new OpModels.SysAdmin();
                 if (sysAdmin.Id > 0)
                 {
-                    condition += " and OpId=" + sysAdmin.Id;
+                    condition += " and OpId=" + sysAdmin.UserId;
                 }
             }
             //是否关联
@@ -228,7 +228,7 @@ namespace MySystem.Areas.Admin.Controllers
 
                 //是否关联
                 int OpId = int.Parse(dic["OpId"].ToString());
-                var opInfo = opdb.SysAdmin.FirstOrDefault(m => m.Id == OpId) ?? new OpModels.SysAdmin();
+                var opInfo = opdb.SysAdmin.FirstOrDefault(m => m.QueryCount > 0 && m.UserId == OpId) ?? new OpModels.SysAdmin();
                 if (OpId == 0) dic["OpIdStatus"] = "否";
                 if (OpId > 0) dic["OpIdStatus"] = opInfo.OpCode;
             }
@@ -1498,7 +1498,8 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                         tamount = amount * posCount;//扣减运营中心该品牌机具额度
                         var userAmount = opdb.UserAccount.FirstOrDefault(m => m.Sort == sysAdmin.Id) ?? new OpModels.UserAccount();
-                        userAmount.ValidAmount -= tamount;
+                        userAmount.ValidAmount -= tamount;//扣减关联分仓机具占用额度
+                        userAmount.ValidAmount += storeInfo.Deposit;//增加关联分仓押金
                         storeInfo.OpId = sysAdmin.Id;
                         db.SaveChanges();
                         opdb.SaveChanges();
@@ -1604,7 +1605,8 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                         tamount = amount * posCount;//扣减运营中心该品牌机具额度
                         var userAmount = opdb.UserAccount.FirstOrDefault(m => m.Sort == sysAdmin.Id) ?? new OpModels.UserAccount();
-                        userAmount.ValidAmount += tamount;
+                        userAmount.ValidAmount += tamount;//增加关联分仓机具占用额度
+                        userAmount.ValidAmount -= storeInfo.Deposit;//扣减关联分仓押金
                         opdb.SaveChanges();
                         var query = opdb.StoreForOperate.FirstOrDefault(m => m.OpId == sysAdmin.UserId && m.StoreId == StoreId);
                         if (query != null)

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 Sort>0 and QueryCount>0 and AdminName!='admin'";
             //运营中心编号
             if (!string.IsNullOrEmpty(OpCode))
             {
@@ -176,6 +176,7 @@ namespace MySystem.Areas.Admin.Controllers
                     Fields.Add("AdminName", data.AdminName); //用户名
                     Fields.Add("Password", function.MD5_32(data.Password)); //密码
                     Fields.Add("FilePath", data.FilePath); //附件
+                    Fields.Add("QueryCount", 1); //是否为主账号(1是，0否)
 
                     int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Add("SysAdmin", Fields, 0);
                     SysAdmin edit = opdb.SysAdmin.FirstOrDefault(m => m.Id == Id);

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

@@ -192,12 +192,12 @@
                     }
                     @if (RightInfo.Contains("," + right + "_batchset,"))
                     {
-                        <button class="layui-btn" data-type="BatchSetting"><i
+                        <button class="layui-btn layui-btn-danger" data-type="BatchSetting"><i
                             class="layui-icon layui-icon-edit layuiadmin-button-btn"></i>关联分仓</button>
                     }
                     @if (RightInfo.Contains("," + right + "_batchcancle,"))
                     {
-                        <button class="layui-btn" data-type="BatchCancle"><i
+                        <button class="layui-btn layui-btn-danger" data-type="BatchCancle"><i
                             class="layui-icon layui-icon-edit layuiadmin-button-btn"></i>取消关联</button>
                     }
                 </div>

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

@@ -126,12 +126,12 @@
                     }
                     @if (RightInfo.Contains("," + right + "_batchset,"))
                     {
-                        <button class="layui-btn" data-type="BatchSetting"><i
+                        <button class=" layui-btn layui-btn-danger" data-type="BatchSetting"><i
                             class="layui-icon layui-icon-edit layuiadmin-button-btn"></i>设置盟主券</button>
                     }
                     @if (RightInfo.Contains("," + right + "_batchcancle,"))
                     {
-                        <button class="layui-btn" data-type="BatchCancle"><i
+                        <button class=" layui-btn layui-btn-danger" data-type="BatchCancle"><i
                             class="layui-icon layui-icon-edit layuiadmin-button-btn"></i>取消盟主券</button>
                     }
                 </div>

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

@@ -117,14 +117,14 @@
                             <button class="layui-btn" data-type="ImportData"><i
                                 class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>提现结果导入</button>
                         }
-                        @if (RightInfo.Contains("," + right + "_cash,"))
+                        @* @if (RightInfo.Contains("," + right + "_cash,"))
                         {
                             <button class="layui-btn" data-type="Cash"><i
                                 class="layui-icon layui-icon-up layuiadmin-button-btn"></i>提交到代付平台</button>
-                        }
+                        } *@
                         @if (RightInfo.Contains("," + right + "_batchset,"))
                         {
-                            <button class="layui-btn" data-type="BatchSetting"><i
+                            <button class="layui-btn layui-btn-danger" data-type="BatchSetting"><i
                                 class="layui-icon layui-icon-edit layuiadmin-button-btn"></i>批量设置成功</button>
                         }
                     </div>

wwwroot/layuiadmin/modules_main/StoreHouse_Admin.js

@@ -493,7 +493,7 @@ layui.config({
     form.on('submit(LAY-list-front-search)', function (data) {
         var field = data.field;
         field.ShowFlag = 1;
-        if (field.StoreNo == "" && field.StoreName == "" && field.UserIdMakerCode == "" && field.UserIdRealName == "" && field.ManageUserIdRealName == "" && field.ManageUserIdMobile == "" && field.ManageUserIdMakerCode == "" && field.ManagerEmail == "" && field.StoreStatusSelect == "" && field.CreateDateData == "" && field.MakerCode == "") {
+        if (field.StoreNo == "" && field.StoreName == "" && field.UserIdMakerCode == "" && field.UserIdRealName == "" && field.ManageUserIdRealName == "" && field.ManageUserIdMobile == "" && field.ManageUserIdMakerCode == "" && field.ManagerEmail == "" && field.StoreStatusSelect == "" && field.CreateDateData == "" && field.MakerCode == "" && field.YZOpCode == "") {
             layer.alert('请输入查询条件');
         }
         else {