Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/HomeController.cs

@@ -149,60 +149,60 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string Login(string UserName, string Pwd, string CheckCode)
         {
-            string result = "";
-            if (function.GetCookie(_accessor.HttpContext, "checkcode") != CheckCode)
-            {
-                result = "验证码错误!!";
-            }
-            else
-            {
-                Pwd = function.MD5_32(Pwd);
-                var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
-                if (user != null)
-                {
-                    user.LastLoginDate = DateTime.Now;
-                    db.SaveChanges();
-                    function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
-                    function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
-                    function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
-                    int RoleId = int.Parse(function.CheckInt(user.Role));
-                    BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
-                    string RightInfo = function.CheckNull(Role.RightInfo);
-                    function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
-                    string UserId = user.Id.ToString();
-                    function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
-                    function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
-                    result = "success";
-                }
-                else
-                {
-                    result = "用户名或密码错误";
-                }
-            }
-
             // string result = "";
-            // Pwd = function.MD5_32(Pwd);
-            // var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
-            // if (user != null)
+            // if (function.GetCookie(_accessor.HttpContext, "checkcode") != CheckCode)
             // {
-            //     user.LastLoginDate = DateTime.Now;
-            //     db.SaveChanges();
-            //     function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
-            //     function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
-            //     function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
-            //     int RoleId = int.Parse(function.CheckInt(user.Role));
-            //     BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
-            //     string RightInfo = function.CheckNull(Role.RightInfo);
-            //     function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
-            //     string UserId = user.Id.ToString();
-            //     function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
-            //     function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
-            //     result = "success";
+            //     result = "验证码错误!!";
             // }
             // else
             // {
-            //     result = "用户名或密码错误";
+            //     Pwd = function.MD5_32(Pwd);
+            //     var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
+            //     if (user != null)
+            //     {
+            //         user.LastLoginDate = DateTime.Now;
+            //         db.SaveChanges();
+            //         function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
+            //         function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
+            //         function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
+            //         int RoleId = int.Parse(function.CheckInt(user.Role));
+            //         BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
+            //         string RightInfo = function.CheckNull(Role.RightInfo);
+            //         function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
+            //         string UserId = user.Id.ToString();
+            //         function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
+            //         function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
+            //         result = "success";
+            //     }
+            //     else
+            //     {
+            //         result = "用户名或密码错误";
+            //     }
             // }
+
+            string result = "";
+            Pwd = function.MD5_32(Pwd);
+            var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
+            if (user != null)
+            {
+                user.LastLoginDate = DateTime.Now;
+                db.SaveChanges();
+                function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
+                function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
+                function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
+                int RoleId = int.Parse(function.CheckInt(user.Role));
+                BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
+                string RightInfo = function.CheckNull(Role.RightInfo);
+                function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
+                string UserId = user.Id.ToString();
+                function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
+                function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
+                result = "success";
+            }
+            else
+            {
+                result = "用户名或密码错误";
+            }
             return result;
         }
         #endregion

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -1625,10 +1625,10 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
-        #region 同步交易额
+        #region 重置仓库额度
 
         /// <summary>
-        /// 同步交易额
+        /// 重置仓库额度
         /// </summary>
         /// <returns></returns>
         public string SycnAmountData(int Id = 0)

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -581,6 +581,10 @@ namespace MySystem.Areas.Admin.Controllers
                 BrandId = Convert.ToInt32(Brand);
                 MachineForSnNo posInfo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posInfo.SnId) ?? new PosMachinesTwo();
+                if (pos.BindingState == 1 || pos.ActivationState == 1)
+                {
+                    error += "以下操作失败" + SnNo + ',' + "该机具已绑定或已激活" + '\n';
+                }
                 if (posInfo.SnId > 0)
                 {
                     if (pos.Id > 0)

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1711,7 +1711,7 @@ namespace MySystem.Areas.Admin.Controllers
                     newpos.UserId = oldpos.UserId;
                     newpos.PreUserId = oldpos.PreUserId;
 
-                    if(!opData.Contains(oldpos.BuyUserId + ":" + oldpos.BrandId))
+                    if (!opData.Contains(oldpos.BuyUserId + ":" + oldpos.BrandId))
                     {
                         opData.Add(oldpos.BuyUserId + ":" + oldpos.BrandId);
                     }
@@ -1905,7 +1905,7 @@ namespace MySystem.Areas.Admin.Controllers
                     newpos.IsFirst = oldpos.IsFirst;
                     newpos.TransferTime = oldpos.TransferTime;
 
-                    if(!opData.Contains(oldpos.BuyUserId + ":" + oldpos.BrandId))
+                    if (!opData.Contains(oldpos.BuyUserId + ":" + oldpos.BrandId))
                     {
                         opData.Add(oldpos.BuyUserId + ":" + oldpos.BrandId);
                     }
@@ -2103,7 +2103,7 @@ namespace MySystem.Areas.Admin.Controllers
             //         }));
             //     }
             // }
-            foreach(string sub in opData)
+            foreach (string sub in opData)
             {
                 string[] datalist = sub.Split(":");
                 PublicFunction.SycnMachineCount(int.Parse(datalist[0]), int.Parse(datalist[1]));
@@ -2113,6 +2113,134 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
+        // #region 机具解绑
+
+        // public IActionResult Unbind(string right)
+        // {
+        //     ViewBag.RightInfo = RightInfo;
+        //     ViewBag.right = right;
+
+        //     return View();
+        // }
+
+        // [HttpPost]
+        // public string UnbindDo(string PosSn, string MakerCode, string MerNo, int IsSend = 0)
+        // {
+        //     if (string.IsNullOrEmpty(PosSn))
+        //     {
+        //         return "请输入机具SN";
+        //     }
+        //     if (string.IsNullOrEmpty(MakerCode))
+        //     {
+        //         return "请输入创客编号";
+        //     }
+        //     MachineForSnNo forSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == PosSn);
+        //     if (forSnNo == null)
+        //     {
+        //         return "机具SN不存在";
+        //     }
+        //     PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == forSnNo.SnId);
+        //     if (pos == null)
+        //     {
+        //         return "机具SN不存在";
+        //     }
+        //     if (string.IsNullOrEmpty(MerNo) && pos.BrandId != 1 && pos.BrandId != 3)
+        //     {
+        //         return "请输入商户编号";
+        //     }
+        //     UserForMakerCode forMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
+        //     if (forMakerCode == null)
+        //     {
+        //         return "创客不存在";
+        //     }
+        //     MachineForMerNo forMerNo = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == MerNo);
+        //     if (forMerNo == null && pos.BrandId != 1 && pos.BrandId != 3)
+        //     {
+        //         return "商户编号不存在";
+        //     }
+        //     if (pos.BuyUserId != forMakerCode.UserId)
+        //     {
+        //         return "机具SN和创客不匹配";
+        //     }
+        //     if (pos.ActivationState == 1)
+        //     {
+        //         return "机具已激活，不能解绑";
+        //     }
+        //     if (pos.BuyUserId == 0)
+        //     {
+        //         return "机具是仓库机，不支持解绑";
+        //     }
+        //     if (pos.BindingState == 0)
+        //     {
+        //         return "机具未绑定，不支持解绑";
+        //     }
+        //     if (pos.BindingTime < DateTime.Now.AddDays(-30) && SysUserName != "admin")
+        //     {
+        //         return "机具绑定已超过30天，不支持解绑";
+        //     }
+        //     if (pos.CreditTrade > 0 || !string.IsNullOrEmpty(pos.SeoKeyword))
+        //     {
+        //         return "该机具已交易，无法解绑";
+        //     }
+        //     if (forMerNo != null)
+        //     {
+        //         PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
+        //         if (merchant != null)
+        //         {
+        //             //机具解绑删除客小爽企业版对应数据
+        //             var merInfo = db.BusinessPartnerMerchant.FirstOrDefault(m => m.MerchantId == merchant.Id);
+        //             if (merInfo != null)
+        //             {
+        //                 db.BusinessPartnerMerchant.Remove(merInfo);
+        //             }
+        //             var posInfo = db.BusinessPartnerPos.FirstOrDefault(m => m.PosId == pos.Id);
+        //             if (posInfo != null)
+        //             {
+        //                 db.BusinessPartnerPos.Remove(posInfo);
+        //             }
+
+        //             db.PosMerchantInfo.Remove(merchant);
+        //         }
+        //         db.MachineForMerNo.Remove(forMerNo);
+        //         db.SaveChanges();
+        //     }
+        //     db.MachineUnBind.Add(new MachineUnBind()
+        //     {
+        //         CreateDate = DateTime.Now,
+        //         SeoTitle = SysUserName + "-" + SysRealName,
+        //         MerchantId = pos.BindMerchantId,
+        //         AuditDate = DateTime.Now,
+        //         AuditDesc = "平台操作解绑",
+        //         AuditStatus = 1,
+        //         SnNo = pos.PosSn,
+        //         BrandId = pos.BrandId,
+        //         UserId = pos.BuyUserId,
+        //         ApplyNo = "U" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8),
+        //     });
+        //     pos.BindMerchantId = 0;
+        //     pos.BindingState = 0;
+        //     pos.BindingTime = DateTime.Parse("1900-01-01");
+        //     pos.UserId = pos.BuyUserId;
+        //     string IdBrand = pos.BuyUserId + "_" + pos.BrandId;
+        //     db.SaveChanges();
+        //     PublicFunction.SycnMachineCount(pos.BuyUserId, pos.BrandId);
+        //     if (IsSend == 1)
+        //     {
+        //         RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+        //         {
+        //             UserId = pos.BuyUserId, //接收创客
+        //             MsgType = 2,
+        //             Title = "解绑成功通知", //标题
+        //             Summary = "" + PosSn + "机具已成功解绑，当前机具如需绑定同一客户请再2个工作日后再进行绑定，直接绑定会导致数控异常，相关损失由您本人承担。",
+        //             CreateDate = DateTime.Now,
+        //         }));
+        //     }
+        //     return "success";
+        // }
+        // #endregion
+
+
+
         #region 机具解绑
 
         public IActionResult Unbind(string right)
@@ -2130,10 +2258,6 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "请输入机具SN";
             }
-            if (string.IsNullOrEmpty(MakerCode))
-            {
-                return "请输入创客编号";
-            }
             MachineForSnNo forSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == PosSn);
             if (forSnNo == null)
             {
@@ -2144,24 +2268,6 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "机具SN不存在";
             }
-            if (string.IsNullOrEmpty(MerNo) && pos.BrandId != 1 && pos.BrandId != 3)
-            {
-                return "请输入商户编号";
-            }
-            UserForMakerCode forMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
-            if (forMakerCode == null)
-            {
-                return "创客不存在";
-            }
-            MachineForMerNo forMerNo = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == MerNo);
-            if (forMerNo == null && pos.BrandId != 1 && pos.BrandId != 3)
-            {
-                return "商户编号不存在";
-            }
-            if (pos.BuyUserId != forMakerCode.UserId)
-            {
-                return "机具SN和创客不匹配";
-            }
             if (pos.ActivationState == 1)
             {
                 return "机具已激活，不能解绑";
@@ -2182,13 +2288,64 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "该机具已交易，无法解绑";
             }
-            if (forMerNo != null)
+            if (pos.BrandId != 10 || pos.BrandId != 11)
             {
-                PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
-                if (merchant != null)
+                if (string.IsNullOrEmpty(MakerCode))
                 {
+                    return "请输入创客编号";
+                }
+                // if (string.IsNullOrEmpty(MerNo) && pos.BrandId != 1 && pos.BrandId != 3)
+                if (string.IsNullOrEmpty(MerNo))
+                {
+                    return "请输入商户编号";
+                }
+                UserForMakerCode forMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
+                if (forMakerCode == null)
+                {
+                    return "创客不存在";
+                }
+                MachineForMerNo forMerNo = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == MerNo);
+                // if (forMerNo == null && pos.BrandId != 1 && pos.BrandId != 3)
+                if (forMerNo == null)
+                {
+                    return "商户编号不存在";
+                }
+                if (pos.BuyUserId != forMakerCode.UserId)
+                {
+                    return "机具SN和创客不匹配";
+                }
+                if (forMerNo != null)
+                {
+                    PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
+                    if (merchant != null)
+                    {
+                        //机具解绑删除客小爽企业版对应数据
+                        var merInfo = db.BusinessPartnerMerchant.FirstOrDefault(m => m.MerchantId == merchant.Id);
+                        if (merInfo != null)
+                        {
+                            db.BusinessPartnerMerchant.Remove(merInfo);
+                        }
+                        var posInfo = db.BusinessPartnerPos.FirstOrDefault(m => m.PosId == pos.Id);
+                        if (posInfo != null)
+                        {
+                            db.BusinessPartnerPos.Remove(posInfo);
+                        }
+
+                        db.PosMerchantInfo.Remove(merchant);
+                    }
+                    db.MachineForMerNo.Remove(forMerNo);
+                    db.SaveChanges();
+                }
+            }
+            else
+            {
+                var posMerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PosMerchantInfo();
+                MachineForMerNo forMerNo = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == MerNo);
+                if (forMerNo != null && posMerchantInfo != null)
+                {
+
                     //机具解绑删除客小爽企业版对应数据
-                    var merInfo = db.BusinessPartnerMerchant.FirstOrDefault(m => m.MerchantId == merchant.Id);
+                    var merInfo = db.BusinessPartnerMerchant.FirstOrDefault(m => m.MerchantId == posMerchantInfo.Id);
                     if (merInfo != null)
                     {
                         db.BusinessPartnerMerchant.Remove(merInfo);
@@ -2199,10 +2356,10 @@ namespace MySystem.Areas.Admin.Controllers
                         db.BusinessPartnerPos.Remove(posInfo);
                     }
 
-                    db.PosMerchantInfo.Remove(merchant);
+                    db.PosMerchantInfo.Remove(posMerchantInfo);
+                    db.MachineForMerNo.Remove(forMerNo);
+                    db.SaveChanges();
                 }
-                db.MachineForMerNo.Remove(forMerNo);
-                db.SaveChanges();
             }
             db.MachineUnBind.Add(new MachineUnBind()
             {
@@ -4100,7 +4257,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     error += "以下操作失败" + OldSnNum + ',' + "该机具不在坏机仓或不存在" + '\n';
                 }
-                if(!opData.Contains(oldpos.BuyUserId + ":" + oldpos.BrandId))
+                if (!opData.Contains(oldpos.BuyUserId + ":" + oldpos.BrandId))
                 {
                     opData.Add(oldpos.BuyUserId + ":" + oldpos.BrandId);
                 }
@@ -4151,7 +4308,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return "Warning|" + error;
             }
             db.SaveChanges();
-            foreach(string sub in opData)
+            foreach (string sub in opData)
             {
                 string[] datalist = sub.Split(":");
                 PublicFunction.SycnMachineCount(int.Parse(datalist[0]), int.Parse(datalist[1]));
@@ -4412,8 +4569,8 @@ namespace MySystem.Areas.Admin.Controllers
                     var userMachineDatas = db.UserMachineData.FirstOrDefault(m => m.IdBrand == fInfo) ?? new UserMachineData();
                     userMachineDatas.TotalMachineCount -= 1;
                     userMachineDatas.UnBindCount -= 1;
-                    
-                    if(!opData.Contains(pos.BuyUserId + ":" + pos.BrandId))
+
+                    if (!opData.Contains(pos.BuyUserId + ":" + pos.BrandId))
                     {
                         opData.Add(pos.BuyUserId + ":" + pos.BrandId);
                     }
@@ -4498,7 +4655,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
             }
             db.SaveChanges();
-            foreach(string sub in opData)
+            foreach (string sub in opData)
             {
                 string[] datalist = sub.Split(":");
                 PublicFunction.SycnMachineCount(int.Parse(datalist[0]), int.Parse(datalist[1]));

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -2296,5 +2296,27 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         #endregion
+
+
+
+        #region 重置小分仓额度
+
+        /// <summary>
+        /// 重置小分仓额度
+        /// </summary>
+        /// <returns></returns>
+        public string SycnAmountData(int Id = 0)
+        {
+            if (Id > 0)
+            {
+                var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == Id) ?? new UserAccount();
+                RedisDbconn.Instance.AddList("ResetSmallStoreByUserIdQueue", userAccount.Id);
+            }
+            AddSysLog(Id, "UserAccount", "SycnAmountData");
+            db.SaveChanges();
+            return "success";
+        }
+
+        #endregion
     }
 }

Areas/Admin/Controllers/OperateServer/StoreHouseOperateController.cs

@@ -65,7 +65,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
             string condition = " and Status>-1 and Sort>0";
-            
+
             if (!string.IsNullOrEmpty(CreateDateData))
             {
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
@@ -113,7 +113,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int Id = int.Parse(function.CheckInt(dic["Id"].ToString()));
                 int PreCount = db.PreSendStockDetail.Count(m => m.FromStoreId == Id && m.ApplyFlag == 0 && m.Status >= 0 && m.Status <= 1);
                 dic["PreNum"] = PreCount.ToString();
-                
+
                 // //分仓额度
                 // var amount = db.UserAccount.FirstOrDefault(m => m.Id == UserId) ?? new UserAccount();
                 // var ValidAmount = amount.ValidAmount;
@@ -173,15 +173,21 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     Dictionary<string, object> Fields = new Dictionary<string, object>();
                     Fields.Add("CreateMan", SysUserName); //创建人
-                    Fields.Add("StoreName", data.StoreName); //仓库名称
                     UserForMakerCode user = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
                     if (user == null)
                     {
                         return "您输入的仓库归属创客编号不存在，请重新输入正确的仓库归属创客编号";
                     }
+                    var userInfo = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
+                    var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Status > -1 && m.Sort > 0 && m.QueryCount > 0 && m.UserId == user.UserId) ?? new OpModels.SysAdmin();
+                    if (sysAdmin.Id == 0)
+                    {
+                        return "您输入的仓库归属创客编号不满足创建条件，不存在运营中心";
+                    }
                     Fields.Add("UserId", user.UserId); //仓库归属人
                     Fields.Add("Areas", data.Areas); //所属地区
                     Fields.Add("Address", data.Address); //仓库地址
+                    Fields.Add("OpId", user.UserId);
                     UserForMakerCode manage = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == ManageMakerCode);
                     if (manage == null)
                     {
@@ -192,72 +198,39 @@ namespace MySystem.Areas.Admin.Controllers
                     Fields.Add("ManageMobile", data.ManageMobile);
                     Fields.Add("Remark", data.Remark); //备注
                     Fields.Add("LimitTopUserId", data.LimitTopUserId); //限制创客特殊仓库
-                    Fields.Add("StoreKind", data.StoreKind); //仓库归属类型
                     int bid = int.Parse(BrandId);
                     KqProducts pro = db.KqProducts.FirstOrDefault(m => m.Id == bid) ?? new KqProducts();
+                    string Nos = "YC000" + bid + sysAdmin.Id;
                     Fields.Add("BrandId", BrandId);
                     Fields.Add("ProductName", pro.Name);
                     Fields.Add("StoreStatus", 1);
                     Fields.Add("Status", 1);
+                    Fields.Add("StoreKind", 2);
+                    Fields.Add("Sort", sysAdmin.Id);
+                    Fields.Add("StoreNo", Nos);
+                    Fields.Add("StoreName", pro.Name + "运营分仓");
 
-                    var name = db.StoreHouse.FirstOrDefault(m => m.UserId == user.UserId && m.BrandId == BrandId && m.StoreName == data.StoreName);
+                    var name = db.StoreHouse.FirstOrDefault(m => m.Sort > 0 && m.UserId == user.UserId && m.BrandId == BrandId && m.StoreName == data.StoreName && m.OpId == user.UserId);
                     if (name != null)
                     {
                         return "您的仓库名重复，请重新填写";
                     }
 
                     int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("StoreHouse", Fields, 0);
-                    StoreHouse edit = db.StoreHouse.FirstOrDefault(m => m.Id == Id);
-                    if (edit != null)
-                    {
-                        string No = Id.ToString();
-                        for (int i = 0; i < 7 - Id.ToString().Length; i++)
-                        {
-                            No = "0" + No;
-                        }
-                        No = "S" + No;
-                        edit.StoreNo = No;
-                        db.StoreForCode.Add(new StoreForCode()
-                        {
-                            Code = No,
-                            StoreId = Id,
-                        });
-                        RedisDbconn.Instance.Set("StoreForCode:" + No, Id);
-                    }
-                    StoreForName storeForName = db.StoreForName.FirstOrDefault(m => m.Name == data.StoreName);
-                    if (storeForName == null)
-                    {
-                        db.StoreForName.Add(new StoreForName()
-                        {
-                            Name = data.StoreName,
-                            StoreId = Id,
-                        });
-                    }
-                    else
-                    {
-                        storeForName.StoreId = Id;
-                    }
-                    UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == user.UserId);
-                    if (account == null)
-                    {
-                        account = db.UserAccount.Add(new UserAccount()
-                        {
-                            Id = user.UserId,
-                            UserId = user.UserId,
-                        }).Entity;
-                        db.SaveChanges();
-                    }
-                    if (account.FixedAmount == 0 && account.ValidAmount == 0)
-                    {
-                        account.FixedAmount = 20000;
-                        account.ValidAmount = 20000;
-                    }
 
-                    RedisDbconn.Instance.Set("StoreForName:" + data.StoreName, Id);
+                    var querys = opdb.StoreForOperate.Add(new OpModels.StoreForOperate()
+                    {
+                        CreateDate = DateTime.Now, //创建时间
+                        CreateMan = SysUserName + "_" + SysRealName,
+                        Sort = user.UserId,
+                        OpId = user.UserId,
+                        StoreId = Id,
+                        SeoKeyword = Nos,
+                        SeoDescription = pro.Name + "运营分仓",
+                    }).Entity;
+                    opdb.SaveChanges();
                     AddSysLog(data.Id.ToString(), "StoreHouse", "add");
                     db.SaveChanges();
-
-                    SetRedis(Id, user.UserId);
                 }
             }
             return "success";
@@ -771,7 +744,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 }).Entity;
                                 db.SaveChanges();
 
-                                if(!opData.Contains(posInfo.BuyUserId + ":" + posInfo.BrandId))
+                                if (!opData.Contains(posInfo.BuyUserId + ":" + posInfo.BrandId))
                                 {
                                     opData.Add(posInfo.BuyUserId + ":" + posInfo.BrandId);
                                 }
@@ -864,7 +837,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 }).Entity;
                                 db.SaveChanges();
 
-                                if(!opData.Contains(posInfo.BuyUserId + ":" + posInfo.BrandId))
+                                if (!opData.Contains(posInfo.BuyUserId + ":" + posInfo.BrandId))
                                 {
                                     opData.Add(posInfo.BuyUserId + ":" + posInfo.BrandId);
                                 }
@@ -908,7 +881,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     return "Warning|" + error;
                 }
-                foreach(string sub in opData)
+                foreach (string sub in opData)
                 {
                     string[] datalist = sub.Split(":");
                     PublicFunction.SycnMachineCount(int.Parse(datalist[0]), int.Parse(datalist[1]));

Areas/Admin/Controllers/OperateServer/StoreMachineApplyOperateController.cs

@@ -707,6 +707,10 @@ namespace MySystem.Areas.Admin.Controllers
                 if (BrandId == 11) FromStoreId = 5513;
                 Models.MachineForSnNo posInfo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new Models.MachineForSnNo();
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posInfo.SnId && m.StoreId == FromStoreId && m.UserId == 0 && m.BuyUserId == 0 && m.PreUserId == 0) ?? new Models.PosMachinesTwo();
+                if (pos.BindingState == 1 || pos.ActivationState == 1)
+                {
+                    error += "以下操作失败" + SnNo + ',' + "该机具已绑定或已激活" + '\n';
+                }
                 if (posInfo.SnId > 0)
                 {
                     if (pos.Id > 0)

Areas/Admin/Controllers/OperateServer/StoreMachineApplysOperateController.cs

@@ -602,6 +602,10 @@ namespace MySystem.Areas.Admin.Controllers
                 if (BrandId == 11) FromStoreId = 5513;
                 MachineForSnNo posInfo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posInfo.SnId && m.StoreId == FromStoreId && m.UserId == 0 && m.BuyUserId == 0 && m.PreUserId == 0) ?? new PosMachinesTwo();
+                if (pos.BindingState == 1 || pos.ActivationState == 1)
+                {
+                    error += "以下操作失败" + SnNo + ',' + "该机具已绑定或已激活" + '\n';
+                }
                 if (posInfo.SnId > 0)
                 {
                     if (pos.Id > 0)

Areas/Admin/Views/Home/Login.cshtml

@@ -26,11 +26,11 @@
                     <label for="password">密码 / Password</label>
                     <input class="form-input" type="password" name="Pwd" id="Pwd" onKeyUp="if(event.keyCode==13){$('#CheckCode').focus();}" placeholder="请填写密码">
                 </div>
-                <div class="form-group pb10">
+                @* <div class="form-group pb10">
                     <label for="password">验证码 / Verification</label>
                     <input class="form-input" type="text" name="CheckCode" id="CheckCode" onkeyup="if(event.keyCode==13){syslogin();}" placeholder="请填写验证码" style="width: 70%; display: inline-block; margin-right: 2%">
                     <img src="/Api/PublicMethod/CheckCode" onclick="$(this).attr('src','/Api/PublicMethod/CheckCode?r='+Math.random())" style="width: 26%; height:38px;" />
-                </div>
+                </div> *@
                 @*<div class="form-group pb10 cf">
                         <label class="remembermetext fl" for="rememberme">
                             <input type="checkbox" checked name="rememberme">&nbsp;记住我的登录

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

@@ -301,6 +301,10 @@
                     <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="sycn"><i class="layui-icon layui-icon-edit"></i>同步机具数</a>
                     <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="sycntrade"><i class="layui-icon layui-icon-edit"></i>同步交易额</a>
                     }
+                    @if (RightInfo.Contains("," + right + "_sycnamount,"))
+                    {
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="sycnamount"><i class="layui-icon layui-icon-edit"></i>重置小分仓额度</a>
+                    }
                     <a class="layui-btn layui-btn-normal layui-btn-xs" lay-href="/Admin/Users/Index?right=@right&SelfId=@("{{d.Id}}")"><i class="layui-icon layui-icon-edit"></i>上级创客</a>
                     <a class="layui-btn layui-btn-normal layui-btn-xs" lay-href="/Admin/Users/Index?right=@right&ParentId=@("{{d.Id}}")"><i class="layui-icon layui-icon-edit"></i>直属创客</a>
                     <a class="layui-btn layui-btn-normal layui-btn-xs" lay-href="/Admin/Users/Children?right=@right&ParentId=@("{{d.Id}}")"><i class="layui-icon layui-icon-edit"></i>直属创客交易额</a>

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

@@ -32,13 +32,13 @@
             <div class="layui-tab" lay-filter="mytabbar">
                 <div class="layui-tab-content mt20">
                     <div class="layui-tab-item layui-show">
-                        <div class="layui-form-item">
+                        @* <div class="layui-form-item">
                             <label class="layui-form-label">*仓库名称</label>
                             <div class="layui-input-inline">
                                 <input class="layui-input" type="text" id="StoreName" name="StoreName" maxlength="32" lay-verify="required|" autocomplete="off"
                                     placeholder="请输入仓库名称">
                             </div>
-                        </div>
+                        </div> *@
                         @{Dictionary<string, string> KqProductBrandDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
                         <div class="layui-form-item">
                             <label class="layui-form-label">*产品类型</label>
@@ -72,16 +72,6 @@
                                     placeholder="请输入仓库归属创客编号(操作员)">
                             </div>
                         </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">*仓库归属类型</label>
-                            <div class="layui-input-inline">
-                                <select id="StoreKind" name="StoreKind" lay-search="" lay-verify="required|">
-                                    <option value="">请选择</option>
-                                    <option value="0">分仓</option>
-                                    <option value="1">总仓</option>
-                                </select>
-                            </div>
-                        </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label">*管理者邮箱</label>
                             <div class="layui-input-inline">

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

@@ -35,14 +35,14 @@
             <div class="layui-tab" lay-filter="mytabbar">
                 <div class="layui-tab-content mt20">
                     <div class="layui-tab-item layui-show">
-                        <div class="layui-form-item">
+                        @* <div class="layui-form-item">
                             <label class="layui-form-label">*仓库名称</label>
                             <div class="layui-input-inline">
                                 <input class="layui-input" type="text" id="StoreName" name="StoreName"
                                     value="@editData.StoreName" maxlength="32" lay-verify="required|" autocomplete="off"
                                     placeholder="请输入仓库名称">
                             </div>
-                        </div>
+                        </div> *@
                         <div class="layui-form-item">
                             <label class="layui-form-label">*仓库状态</label>
                             <div class="layui-input-inline">
@@ -80,19 +80,6 @@
                                     placeholder="请输入仓库归属创客编号(操作员)">
                             </div>
                         </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">*仓库归属类型</label>
-                            <div class="layui-input-inline">
-                                <select id="StoreKind" name="StoreKind" lay-search="" lay-verify="required|">
-                                    <option value="">请选择</option>
-                                    <option value="0">分仓</option>
-                                    <option value="1">总仓</option>
-                                </select>
-                                <script>
-                                    $("#StoreKind").val("@editData.StoreKind");
-                                </script>
-                            </div>
-                        </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label">*管理者邮箱</label>
                             <div class="layui-input-inline">

wwwroot/layuiadmin/modules_main/StoreHouse_Admin.js

@@ -304,7 +304,7 @@ layui.config({
                 sort: true
             }, {
                 title: '操作',
-                width: 300,
+                width: 500,
                 align: 'center',
                 fixed: 'right',
                 toolbar: '#table-list-tools'

wwwroot/layuiadmin/modules_main/StoreMachineApply_Admin.js

@@ -289,7 +289,7 @@ layui.config({
                                         });
                                     } else {
                                         layer.close(index); //关闭弹层
-                                        layer.msg('审核完成', {
+                                        layer.msg('失败', {
                                             time: 1500
                                         }, function () {
                                             table.reload('LAY-list-manage'); //数据刷新

wwwroot/layuiadmin/modules_main/Users_Admin.js

@@ -115,7 +115,7 @@ layui.config({
             , { field: 'RiskFlagName', width: 200, title: '风控状态', sort: true }
             , { field: 'CreateDate', width: 200, title: '注册时间', sort: true }
 
-            , { title: '操作', width: 1800, align: 'left', toolbar: '#table-list-tools' }
+            , { title: '操作', width: 2000, align: 'left', toolbar: '#table-list-tools' }
         ]]
         , where: {
             SelfId: SelfId,
@@ -664,6 +664,28 @@ layui.config({
                     }
                 });
             });
+        } else if (obj.event === 'sycnamount') {
+            var index = layer.confirm('确定要重置该创客的小分仓额度吗？', function (index) {
+                layer.close(index);
+                var loadindex = layer.load(1, {
+                    shade: [0.5, '#000']
+                });
+                $.ajax({
+                    type: "POST",
+                    url: "/Admin/Users/SycnAmountData?r=" + Math.random(1),
+                    data: "Id=" + data.Id,
+                    dataType: "text",
+                    success: function (data) {
+                        layer.close(loadindex);
+                        if (data == "success") {
+                            layer.msg('重置成功');
+                            table.reload('LAY-list-manage');
+                        } else {
+                            layer.msg(data);
+                        }
+                    }
+                });
+            });
         } else if (obj.event === 'sycntrade') {
             var tr = $(obj.tr);
             var perContent = layer.open({

wwwroot/layuiadmin/modules_operate/StoreMachineApplys1_Admin.js

@@ -297,7 +297,7 @@ layui.config({
                                         });
                                     } else {
                                         layer.close(index); //关闭弹层
-                                        layer.msg('审核完成', {
+                                        layer.msg('失败', {
                                             time: 1500
                                         }, function () {
                                             table.reload('LAY-list-manage'); //数据刷新

wwwroot/layuiadmin/modules_operate/StoreMachineApplys_Admin.js

@@ -294,7 +294,7 @@ layui.config({
                                         });
                                     } else {
                                         layer.close(index); //关闭弹层
-                                        layer.msg('审核完成', {
+                                        layer.msg('失败', {
                                             time: 1500
                                         }, function () {
                                             table.reload('LAY-list-manage'); //数据刷新