合并代码

Areas/Admin/Controllers/MainServer/StoreBalanceController.cs

@@ -50,7 +50,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 仓库库存变动信息列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(StoreBalance data, string StoreIdStoreNo, string StoreIdStoreName, string TransTypeSelect, string BrandIdSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(StoreBalance data, string StoreIdStoreNo, string StoreIdStoreName, string TransTypeSelect, string CreateDateData, string BrandIdSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -63,12 +63,20 @@ namespace MySystem.Areas.Admin.Controllers
             //仓库仓库编号
             if (!string.IsNullOrEmpty(StoreIdStoreNo))
             {
-                condition += " and StoreId in (select StoreId from StoreForStoreNo where StoreNo='" + StoreIdStoreNo + "')";
+                condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreIdStoreNo + "')";
             }
             //仓库仓库名称
             if (!string.IsNullOrEmpty(StoreIdStoreName))
             {
-                condition += " and StoreId in (select StoreId from StoreForStoreName where StoreName='" + StoreIdStoreName + "')";
+                condition += " and StoreId in (select StoreId from StoreForStoreName where Name='" + StoreIdStoreName + "')";
+            }
+            //操作时间
+            if(!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
             //交易类型
             if (!string.IsNullOrEmpty(TransTypeSelect))
@@ -107,10 +115,34 @@ namespace MySystem.Areas.Admin.Controllers
 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("InCount", 0);
-            other.Add("MoveInCount", 0);
-            other.Add("MoveOutCount", 0);
-            other.Add("OutCount", 0);
+            int InCount = 0;//入库
+            int MoveInCount = 0;//调拨入库
+            int MoveOutCount = 0;//调拨出库
+            int OutCount = 0;//出库
+            DataTable dt = OtherMySqlConn.dtable("select sum(OpStoreNum) from StoreBalance where TransType=0" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                InCount = int.Parse(function.CheckNum(dt.Rows[0][0].ToString()));
+            }
+            dt = OtherMySqlConn.dtable("select sum(OpStoreNum) from StoreBalance where TransType=1 and OpSymbol='+'" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                MoveInCount = int.Parse(function.CheckNum(dt.Rows[0][0].ToString()));
+            }
+            dt = OtherMySqlConn.dtable("select sum(OpStoreNum) from StoreBalance where TransType=1 and OpSymbol='-'" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                MoveOutCount = int.Parse(function.CheckNum(dt.Rows[0][0].ToString()));
+            }
+            dt = OtherMySqlConn.dtable("select sum(OpStoreNum) from StoreBalance where TransType=2" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                OutCount = int.Parse(function.CheckNum(dt.Rows[0][0].ToString()));
+            }
+            other.Add("InCount", InCount);
+            other.Add("MoveInCount", MoveInCount);
+            other.Add("MoveOutCount", MoveOutCount);
+            other.Add("OutCount", OutCount);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/UserAccountController.cs

@@ -239,6 +239,48 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
+        #region 冻结创客账户添加备注
+
+        /// <summary>
+        /// 增加或修改创客账户信息
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult CloseRemark(string right, int Id = 0)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+
+            UserAccount editData = db.UserAccount.FirstOrDefault(m => m.Id == Id) ?? new UserAccount();
+            ViewBag.data = editData;
+            return View();
+        }
+
+        #endregion
+
+        #region 冻结创客账户添加备注
+
+        /// <summary>
+        /// 增加或修改创客账户信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public string CloseRemark(UserAccount data)
+        {
+            Dictionary<string, object> Fields = new Dictionary<string, object>();
+
+            Fields.Add("UserId", data.UserId); //创客
+            Fields.Add("AccountStatus", 1); //账户状态
+            Fields.Add("SeoDescription", data.SeoDescription); //冻结备注
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("UserAccount", Fields, data.Id);
+            AddSysLog(data.Id.ToString(), "UserAccount", "CloseRemark");
+            db.SaveChanges();
+
+            return "success";
+        }
+
+        #endregion
+
         #region 删除创客账户信息
 
         /// <summary>
@@ -278,6 +320,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("AccountStatus", 0);
+                Fields.Add("SeoDescription", "");
                 new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("UserAccount", Fields, id);
             }
             db.SaveChanges();

Areas/Admin/Controllers/MainServer/UserStoreChangeController.cs

@@ -50,7 +50,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客库存变动记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(UserStoreChange data, string UserIdMakerCode, string UserIdRealName, string BindMerchantIdMerchantNo, string BindMerchantIdMerchantName, string BrandIdSelect, string TransTypeSelect, string StockOpDirectSelect, string SnStatusSelect, string BindStatusSelect, string ActiveStatusSelect, string BrandTypeSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(UserStoreChange data, string UserIdMakerCode, string UserIdRealName, string BindMerchantIdMerchantNo, string BindMerchantIdMerchantName, string BrandIdSelect, string TransTypeSelect, string StockOpDirectSelect, string SnStatusSelect, string BindStatusSelect, string ActiveStatusSelect, string BrandTypeSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -115,7 +115,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and BrandType=" + BrandTypeSelect;
             }
-
+            //变动时间
+            if (!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserStoreChange", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -194,25 +201,35 @@ namespace MySystem.Areas.Admin.Controllers
 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("NotPutNotBindCount", 0);
-            other.Add("NotPutBindCount", 0);
-            other.Add("PutNotBindCount", 0);
-            other.Add("PutBindCount", 0);
-            
-            other.Add("NotPutNotBindCount2", 0);
-            other.Add("NotPutBindCount2", 0);
-            other.Add("PutNotBindCount2", 0);
-            other.Add("PutBindCount2", 0);
-            
-            other.Add("NotPutNotBindCount3", 0);
-            other.Add("NotPutBindCount3", 0);
-            other.Add("PutNotBindCount3", 0);
-            other.Add("PutBindCount3", 0);
-            
-            other.Add("NotPutNotBindCount4", 0);
-            other.Add("NotPutBindCount4", 0);
-            other.Add("PutNotBindCount4", 0);
-            other.Add("PutBindCount4", 0);
+            int NotPutNotBindCount = 0;//未拨出未绑定
+            int NotPutBindCount = 0;//未拨出已绑定
+            int PutNotBindCount = 0;//已拨出未绑定
+            int PutBindCount = 0;//已拨出已绑定
+
+            DataTable dt = OtherMySqlConn.dtable("select count(0) from UserStoreChange where SnStatus=0 and BindStatus=0" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                NotPutNotBindCount = int.Parse(function.CheckNum(dt.Rows[0][0].ToString()));
+            }
+            dt = OtherMySqlConn.dtable("select count(0) from UserStoreChange where SnStatus=0 and BindStatus=1" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                NotPutBindCount = int.Parse(function.CheckNum(dt.Rows[0][0].ToString()));
+            }
+            dt = OtherMySqlConn.dtable("select count(0) from UserStoreChange where SnStatus=1 and BindStatus=0" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                PutNotBindCount = int.Parse(function.CheckNum(dt.Rows[0][0].ToString()));
+            }
+            dt = OtherMySqlConn.dtable("select count(0) from UserStoreChange where SnStatus=1 and BindStatus=1" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                PutBindCount = int.Parse(function.CheckNum(dt.Rows[0][0].ToString()));
+            }
+            other.Add("NotPutNotBindCount", NotPutNotBindCount);
+            other.Add("NotPutBindCount", NotPutBindCount);
+            other.Add("PutNotBindCount", PutNotBindCount);
+            other.Add("PutBindCount", PutBindCount);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -58,7 +58,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(Users data, string ParentMakerCode, string ParentRealName, string AuthFlagSelect, int TopUserId, string RiskFlagSelect, string MerchantTypeSelect, int SelfId = 0, int ParentId = 0, int page = 1, int limit = 30)
+        public JsonResult IndexData(Users data, string ParentMakerCode, string ParentRealName, string AuthFlagSelect, int TopUserId, string RiskFlagSelect, string MerchantTypeSelect, int? sSettleAmount, int? eSettleAmount, int? sCashFreezeAmt, int? eCashFreezeAmt, int SelfId = 0, int ParentId = 0, int page = 1, int limit = 30)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("MakerCode", "1"); //创客编号
@@ -69,39 +69,59 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SettleAmount", "3"); //结算金额
             Fields.Add("CashFreezeAmt", "3"); //冻结金额
             Fields.Add("UserLevel", "0"); //创客等级
+            Fields.Add("sSettleAmount", "31"); //结算金额s
+            Fields.Add("eSettleAmount", "32"); //结算金额e
+            Fields.Add("sCashFreezeAmt", "33"); //冻结金额s
+            Fields.Add("eCashFreezeAmt", "34"); //冻结金额e
 
             string condition = " and Status>-1";
             string sort = "Id desc";
             //直属创客编号
             if (!string.IsNullOrEmpty(ParentMakerCode))
             {
-                condition += " and Id in (select UserId from UserForMakerCode where MakerCode='" + ParentMakerCode + "')";
+                condition += " and ParentUserId in (select UserId from UserForMakerCode where MakerCode='" + ParentMakerCode + "')";
             }
             //直属创客名称
             if (!string.IsNullOrEmpty(ParentRealName))
             {
-                condition += " and Id in (select UserId from UserForRealName where RealName='" + ParentRealName + "')";
+                condition += " and ParentUserId in (select UserId from UserForRealName where RealName='" + ParentRealName + "')";
             }
             //实名状态
-            if(!string.IsNullOrEmpty(AuthFlagSelect))
+            if (!string.IsNullOrEmpty(AuthFlagSelect))
             {
                 condition += " and AuthFlag=" + AuthFlagSelect;
             }
             //顶级创客
-            if(TopUserId > 0)
+            if (TopUserId > 0)
             {
                 condition += " and ParentNav like '," + TopUserId + ",%'";
             }
             //风控标识
-            if(!string.IsNullOrEmpty(RiskFlagSelect))
+            if (!string.IsNullOrEmpty(RiskFlagSelect))
             {
                 condition += " and RiskFlag=" + RiskFlagSelect;
             }
             //商户创客类型
-            if(!string.IsNullOrEmpty(MerchantTypeSelect))
+            if (!string.IsNullOrEmpty(MerchantTypeSelect))
             {
                 condition += " and MerchantType=" + MerchantTypeSelect;
             }
+            if (sSettleAmount != null)
+            {
+                condition += " and SettleAmount>=" + sSettleAmount.Value;
+            }
+            if (eSettleAmount != null)
+            {
+                condition += " and SettleAmount<=" + eSettleAmount.Value;
+            }
+            if (sCashFreezeAmt != null)
+            {
+                condition += " and CashFreezeAmt>=" + sCashFreezeAmt.Value;
+            }
+            if (eCashFreezeAmt != null)
+            {
+                condition += " and CashFreezeAmt<=" + eCashFreezeAmt.Value;
+            }
             if (SelfId > 0)
             {
                 Users self = db.Users.FirstOrDefault(m => m.Id == SelfId);
@@ -113,7 +133,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
             }
             if (ParentId > 0)
-            { 
+            {
                 condition += " and ParentUserId=" + ParentId;
             }
 
@@ -241,7 +261,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             Users editData = db.Users.FirstOrDefault(m => m.Id == Id) ?? new Users();
             ViewBag.data = editData;
-            
+
             return View();
         }
 
@@ -271,7 +291,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         #endregion
-        
+
         #region 修改结算金额
 
         public IActionResult EditSettleAmount(string right, int Id = 0)
@@ -279,7 +299,7 @@ namespace MySystem.Areas.Admin.Controllers
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
             Users editData = db.Users.FirstOrDefault(m => m.Id == Id) ?? new Users();
-            ViewBag.data = editData;            
+            ViewBag.data = editData;
             return View();
         }
 
@@ -426,7 +446,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         #endregion
-        
+
         #region 详情
 
         public IActionResult Detail(string right, int Id = 0)
@@ -451,7 +471,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         #endregion
-        
+
         #region 三/四要素验证
 
         public IActionResult ThreeElement(string right)
@@ -468,7 +488,7 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string ThreeElement(string Name, string CertId, string CardNo, string Mobile)
         {
-            
+
             return "success";
         }
 
@@ -641,7 +661,7 @@ namespace MySystem.Areas.Admin.Controllers
                     string SettleAmount = dr[2].ToString();
                     UserForMakerCode UserCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
                     if (UserCode != null)
-                    { 
+                    {
                         Users User = db.Users.FirstOrDefault(m => m.Id == UserCode.UserId);
                         if (User != null)
                         {
@@ -660,7 +680,7 @@ namespace MySystem.Areas.Admin.Controllers
                     string CashFreezeAmt = dr[2].ToString();
                     UserForMakerCode UserCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
                     if (UserCode != null)
-                    { 
+                    {
                         Users User = db.Users.FirstOrDefault(m => m.Id == UserCode.UserId);
                         if (User != null)
                         {
@@ -680,7 +700,7 @@ namespace MySystem.Areas.Admin.Controllers
                     string RiskNote = dr[3].ToString();
                     UserForMakerCode UserCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
                     if (UserCode != null)
-                    { 
+                    {
                         Users User = db.Users.FirstOrDefault(m => m.Id == UserCode.UserId);
                         if (User != null)
                         {
@@ -691,6 +711,89 @@ namespace MySystem.Areas.Admin.Controllers
                 }
                 db.SaveChanges();
             }
+            else if (Kind == 4)
+            {
+                for (int i = 1; i < list.Count; i++)
+                {
+                    JsonData dr = list[i];
+                    string MakerCode = dr[0].ToString();
+                    string OperationAmt = dr[2].ToString();//操作金额
+                    string OperationType = dr[3].ToString();//操作类型
+
+                    UserForMakerCode UserCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
+                    if (UserCode != null)
+                    {
+                        Users User = db.Users.FirstOrDefault(m => m.Id == UserCode.UserId);
+                        UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == User.Id);
+                        if (account == null)
+                        {
+                            account = db.UserAccount.Add(new UserAccount()
+                            {
+                                Id = User.Id,
+                                UserId = User.Id,
+                            }).Entity;
+                            db.SaveChanges();
+                        }
+                        if (User != null)
+                        {
+                            if ((OperationType == "1" || OperationType == "3") && User.CashFreezeAmt > account.BalanceAmount)
+                            {
+                                return "账号余额不足";
+                            }
+                            decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                            decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                            decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                            int ChangeType = 0;
+                            if (OperationType == "1")
+                            {
+                                account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
+                                account.FreezeAmount += Convert.ToDecimal(OperationAmt);
+                                ChangeType = 61;
+                            }
+                            else if (OperationType == "2")
+                            {
+                                account.BalanceAmount += Convert.ToDecimal(OperationAmt);
+                                account.FreezeAmount -= Convert.ToDecimal(OperationAmt);
+                                ChangeType = 62;
+                            }
+                            else if (OperationType == "3")
+                            {
+                                account.TotalAmount -= Convert.ToDecimal(OperationAmt);
+                                account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
+                                ChangeType = 63;
+                            }
+                            else if (OperationType == "4")
+                            {
+                                account.TotalAmount += Convert.ToDecimal(OperationAmt);
+                                account.BalanceAmount += Convert.ToDecimal(OperationAmt);
+                                ChangeType = 64;
+                            }
+                            decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                            decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                            decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                            UserAccountRecord userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord()
+                            {
+                                CreateDate = DateTime.Now,
+                                UpdateDate = DateTime.Now,
+                                UserId = User.Id, //创客
+                                ChangeType = ChangeType, //变动类型
+                                ChangeAmount = Convert.ToDecimal(OperationAmt), //变更金额
+                                BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                                AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                                BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                                AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                                BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                                AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                                Remark = dr[4].ToString(),
+                            }).Entity;
+                            db.SaveChanges();
+                            AddSysLog(User.Id.ToString(), "Users", "ChangeCashFreezeAmts");
+                            db.SaveChanges();
+                        }
+                    }
+                }
+                db.SaveChanges();
+            }
             AddSysLog("0", "Users", "Import");
             return "success";
         }
@@ -726,22 +829,22 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and Id in (select UserId from UserForRealName where RealName='" + ParentRealName + "')";
             }
             //实名状态
-            if(!string.IsNullOrEmpty(AuthFlagSelect))
+            if (!string.IsNullOrEmpty(AuthFlagSelect))
             {
                 condition += " and AuthFlag=" + AuthFlagSelect;
             }
             //顶级创客
-            if(TopUserId > 0)
+            if (TopUserId > 0)
             {
                 condition += " and ParentNav like '," + TopUserId + ",%'";
             }
             //风控标识
-            if(!string.IsNullOrEmpty(RiskFlagSelect))
+            if (!string.IsNullOrEmpty(RiskFlagSelect))
             {
                 condition += " and RiskFlag=" + RiskFlagSelect;
             }
             //商户创客类型
-            if(!string.IsNullOrEmpty(MerchantTypeSelect))
+            if (!string.IsNullOrEmpty(MerchantTypeSelect))
             {
                 condition += " and MerchantType=" + MerchantTypeSelect;
             }
@@ -755,7 +858,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
             }
             if (ParentId > 0)
-            { 
+            {
                 condition += " and ParentUserId=" + ParentId;
             }
 
@@ -773,7 +876,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["ParentRealName"] = puser.RealName;
                 string ParentNav = dic["ParentNav"].ToString();
                 if (!string.IsNullOrEmpty(ParentNav))
-                { 
+                {
                     string[] list = ParentNav.Trim(',').Replace(",,", ",").Split(',');
                     if (list.Length > 1)
                     {
@@ -854,7 +957,7 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
         #region 同步交易额
-        
+
         [HttpPost]
         public string SycnTradeAmountDo(DateTime sdate, DateTime edate, int UserId, int BrandId)
         {
@@ -863,7 +966,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return "时间间隔不能超过1个月";
             }
             if (edate >= DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00"))
-            { 
+            {
                 return "结束时间只能是今天之前";
             }
             string check = RedisDbconn.Instance.Get<string>("ResetUserTradeQueue:" + UserId + ":" + BrandId);
@@ -926,7 +1029,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and Id in (select UserId from UserForRealName where RealName='" + ParentRealName + "')";
             }
             //顶级创客
-            if(TopUserId > 0)
+            if (TopUserId > 0)
             {
                 condition += " and ParentNav like '," + TopUserId + ",%'";
             }
@@ -941,7 +1044,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["ParentRealName"] = puser.RealName;
                 string ParentNav = dic["ParentNav"].ToString();
                 if (!string.IsNullOrEmpty(ParentNav))
-                { 
+                {
                     int TopId = int.Parse(ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
                     Users tuser = db.Users.FirstOrDefault(m => m.Id == TopId) ?? new Users();
                     dic["TopMakerCode"] = tuser.MakerCode;
@@ -979,22 +1082,22 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and Id in (select UserId from UserForRealName where RealName='" + ParentRealName + "')";
             }
             //实名状态
-            if(!string.IsNullOrEmpty(AuthFlagSelect))
+            if (!string.IsNullOrEmpty(AuthFlagSelect))
             {
                 condition += " and AuthFlag=" + AuthFlagSelect;
             }
             //顶级创客
-            if(TopUserId > 0)
+            if (TopUserId > 0)
             {
                 condition += " and ParentNav like '," + TopUserId + ",%'";
             }
             //风控标识
-            if(!string.IsNullOrEmpty(RiskFlagSelect))
+            if (!string.IsNullOrEmpty(RiskFlagSelect))
             {
                 condition += " and RiskFlag=" + RiskFlagSelect;
             }
             //商户创客类型
-            if(!string.IsNullOrEmpty(MerchantTypeSelect))
+            if (!string.IsNullOrEmpty(MerchantTypeSelect))
             {
                 condition += " and MerchantType=" + MerchantTypeSelect;
             }
@@ -1013,7 +1116,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["ParentRealName"] = puser.RealName;
                 string ParentNav = dic["ParentNav"].ToString();
                 if (!string.IsNullOrEmpty(ParentNav))
-                { 
+                {
                     int TopId = int.Parse(ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
                     Users tuser = db.Users.FirstOrDefault(m => m.Id == TopId) ?? new Users();
                     dic["TopMakerCode"] = tuser.MakerCode;

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

@@ -38,13 +38,13 @@
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-                        <label class="layui-form-label">仓库仓库编号</label>
+                        <label class="layui-form-label">仓库编号</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="StoreIdStoreNo" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
-                        <label class="layui-form-label">仓库仓库名称</label>
+                        <label class="layui-form-label">仓库名称</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="StoreIdStoreName" autocomplete="off">
                         </div>
@@ -104,7 +104,7 @@
 
             <div class="layui-card-body">
                 <blockquote class="layui-elem-quote layui-text">
-                    入库(台)：<span style="color: #f00;" id="TotalAmount">0</span>　|　调拨入库(台)：<span style="color: #f00;" id="FreezeAmount">0</span>　|　调拨出库(台)：<span style="color: #f00;" id="BalanceAmount">0</span>　|　出库(台)：<span style="color: #f00;" id="BalanceAmount">0</span>
+                    入库(台)：<span style="color: #f00;" id="InCount">0</span>　|　调拨入库(台)：<span style="color: #f00;" id="MoveInCount">0</span>　|　调拨出库(台)：<span style="color: #f00;" id="MoveOutCount">0</span>　|　出库(台)：<span style="color: #f00;" id="OutCount">0</span>
                 </blockquote>
                 
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>

Areas/Admin/Views/MainServer/UserAccount/CloseRemark.cshtml

@@ -0,0 +1,215 @@
+@using MySystem.Models;
+@{
+    UserAccount editData = ViewBag.data as UserAccount;
+}
+@{
+    string RightInfo = ViewBag.RightInfo as string;
+    string right = ViewBag.right as string;
+
+}
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>创客账户冻结</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
+    <script src="/admin/js/jquery-1.10.1.min.js"></script>
+    <script src="/admin/js/LAreaData2.js"></script>
+</head>
+
+<body>
+
+    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
+        <input type="hidden" name="Id" value="@editData.Id" />
+
+        <div class="layui-card">
+            <div class="layui-card-body">
+                <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 layui-form-text">
+                                <label class="layui-form-label">账户冻结备注</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="SeoDescription" name="SeoDescription"
+                                        maxlength="128" lay-verify=""
+                                        placeholder="请输入账户冻结备注">@editData.SeoDescription</textarea>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-form-item layui-hide">
+                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
+                        value="确认">
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
+    <script src="/other/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+
+
+        //编辑器
+        KindEditor.ready(function (K) {
+
+        });
+
+        var ids = "";
+        function getChildren(obj) {
+            $.each(obj, function (index, value) {
+                var id = obj[index].id;
+                ids += id + ",";
+                var children = obj[index].children;
+                if (children) {
+                    getChildren(children);
+                }
+            });
+        }
+
+        function AreasProvinceInit(tagId, areasVal, form) {
+            for (var i = 0; i < provs_data.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(provs_data[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
+            }
+            form.render();
+        }
+
+        function AreasProvinceSelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "City").html('<option value="">市</option>');
+            var list = citys_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasCitySelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            var list = dists_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasAreaSelected(tagId, form) {
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+        function movePrev(obj, tagId) {
+            $(obj).parent().prev().insertAfter($(obj).parent());
+            checkPics(tagId);
+        }
+        function moveNext(obj, tagId) {
+            $(obj).parent().next().insertBefore($(obj).parent());
+            checkPics(tagId);
+        }
+        function deletePic(obj, tagId) {
+            $(obj).parent().remove();
+            checkPics(tagId);
+        }
+        function checkPics(tagId) {
+            var pics = "";
+            var texts = "";
+            $("#" + tagId + "Image div img").each(function (i) {
+                pics += $(this).attr("src").replace(osshost, '') + "|";
+            });
+            $("#" + tagId + "Image div input").each(function (i) {
+                texts += $(this).val() + "|";
+            });
+            if (pics == "") {
+                $("#" + tagId).val("");
+            } else {
+                pics = pics.substring(0, pics.length - 1);
+                texts = texts.substring(0, pics.length - 1);
+                $("#" + tagId).val(pics + "#cut#" + texts);
+            }
+        }
+        function checkBox(tagId) {
+            var text = "";
+            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
+                text += $(this).val() + ",";
+            });
+            $("#" + tagId).val(text);
+        }
+        function showBigPic(picpath) {
+            parent.layer.open({
+                type: 1,
+                title: false,
+                closeBtn: 0,
+                shadeClose: true,
+                area: ['auto', 'auto'],
+                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
+            });
+        }
+
+        var tree;
+        var element;
+        var upload;
+        layui.config({
+            base: '/layuiadmin/' //静态资源所在路径
+        }).extend({
+            index: 'lib/index' //主入口模块
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+            var $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , layedit = layui.layedit
+                , laydate = layui.laydate
+                , croppers = layui.croppers
+                , transfer = layui.transfer
+                , util = layui.util;
+            tree = layui.tree;
+            element = layui.element;
+            upload = layui.upload;
+
+            //Hash地址的定位
+            var layid = location.hash.replace(/^#test=/, '');
+            element.tabChange('test', layid);
+            element.on('tab(test)', function (elem) {
+                location.hash = 'test=' + $(this).attr('lay-id');
+            });
+
+            //日期
+
+
+            //上传文件
+
+
+            //穿梭框
+
+
+            //TreeView，比如权限管理
+
+
+            //省市区
+
+        })
+
+    </script>
+</body>
+
+</html>

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

@@ -76,8 +76,8 @@
                             <div class="layui-input-inline">
                                 <select id="AccountStatusSelect" name="AccountStatusSelect" lay-search="">
                                     <option value="">全部...</option>
-                                    <option value="0">冻结</option>
-                                    <option value="1">有效</option>
+                                    <option value="0">有效</option>
+                                    <option value="1">冻结</option>
                                 </select>
                             </div>
                         </div>
@@ -114,6 +114,7 @@
                     <a class="layui-btn layui-btn-warm layui-btn-xs" lay-text="{{d.RealName}}账户详情" lay-href="/Admin/UserAccountRecord/Index?right=@right&UserId=@("{{d.Id}}")"><i class="layui-icon layui-icon-read"></i>详情</a>
                     @if (RightInfo.Contains("," + right + "_Freeze,"))
                     {
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="closeRemark"><i class="layui-icon layui-icon-edit"></i>冻结备注</a>
                     @("{{#if (d.AccountStatus == 0){ }}")
                     <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Close"><i class="layui-icon layui-icon-edit"></i>冻结</a>
                     @("{{#}else{ }}")

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

@@ -166,11 +166,8 @@
 
             <div class="layui-card-body">
                 <blockquote class="layui-elem-quote layui-text">
-                    客小爽Mpos未拨出未绑定(台)：<span style="color: #f00;" id="NotPutNotBindCount">0</span>　|　客小爽Mpos未拨出已绑定(台)：<span style="color: #f00;" id="NotPutBindCount">0</span>　|　客小爽Mpos已拨出未绑定(台)：<span style="color: #f00;" id="PutNotBindCount">0</span>　|　客小爽Mpos已拨出已绑定(台)：<span style="color: #f00;" id="PutBindCount">0</span><br />
-                    客小爽大POS未拨出未绑定(台)：<span style="color: #f00;" id="NotPutNotBindCount2">0</span>　|　客小爽大POS未拨出已绑定(台)：<span style="color: #f00;" id="NotPutBindCount2">0</span>　|　客小爽大POS已拨出未绑定(台)：<span style="color: #f00;" id="PutNotBindCount2">0</span>　|　客小爽大POS已拨出已绑定(台)：<span style="color: #f00;" id="PutBindCount2">0</span><br />
-                    客小爽电签POS未拨出未绑定(台)：<span style="color: #f00;" id="NotPutNotBindCount3">0</span>　|　客小爽电签POS未拨出已绑定(台)：<span style="color: #f00;" id="NotPutBindCount3">0</span>　|　客小爽电签POS已拨出未绑定(台)：<span style="color: #f00;" id="PutNotBindCount3">0</span>　|　客小爽电签POS已拨出已绑定(台)：<span style="color: #f00;" id="PutBindCount3">0</span><br />
-                    客小爽超级MPOS未拨出未绑定(台)：<span style="color: #f00;" id="NotPutNotBindCount4">0</span>　|　客小爽超级MPOS未拨出已绑定(台)：<span style="color: #f00;" id="NotPutBindCount4">0</span>　|　客小爽超级MPOS已拨出未绑定(台)：<span style="color: #f00;" id="PutNotBindCount4">0</span>　|　客小爽超级MPOS已拨出已绑定(台)：<span style="color: #f00;" id="PutBindCount4">0</span>
-                </blockquote>
+                    未拨出未绑定(台)：<span style="color: #f00;" id="NotPutNotBindCount">0</span>　|　未拨出已绑定(台)：<span style="color: #f00;" id="NotPutBindCount">0</span>　|　已拨出未绑定(台)：<span style="color: #f00;" id="PutNotBindCount">0</span>　|　已拨出已绑定(台)：<span style="color: #f00;" id="PutBindCount">0</span><br />
+                   </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                 </script>

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

@@ -94,7 +94,7 @@
 
             <div class="layui-card-body">
                 <blockquote class="layui-elem-quote layui-text">
-                    直营商户交易总额(元)：<span style="color: #f00;" id="DirectTradeAmt">0.00</span>　|　直营商户借记卡交易总额(元)：<span style="color: #f00;" id="DirectDebitTradeAmt">0.00</span>　|　直营激活商户数(元)：<span style="color: #f00;" id="DirectDebitCapNum">0</span>
+                    直营商户交易总额(元)：<span style="color: #f00;" id="DirectTradeAmt">0.00</span>　|　直营商户借记卡交易总额(元)：<span style="color: #f00;" id="DirectDebitTradeAmt">0.00</span>　|　直营激活商户数(个)：<span style="color: #f00;" id="DirectDebitCapNum">0</span>
                 </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">

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

@@ -155,7 +155,6 @@
                                 </select>
                             </div>
                         </div>
-                    
                         <div class="layui-inline">
                             <label class="layui-form-label">结算金额</label>
                             <div class="layui-input-inline w100">
@@ -208,6 +207,7 @@
                         <button class="layui-btn" data-type="ImportSettleAmount"><i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>导入结算金额</button>
                         <button class="layui-btn" data-type="ImportFreezeAmt"><i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>导入冻结金额</button>
                         <button class="layui-btn" data-type="ImportRisk"><i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>导入风控数据</button>
+                        <button class="layui-btn" data-type="ImportEditAmt"><i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>批量修改账户金额</button>
                     }
                 </div>
 

wwwroot/layuiadmin/modules_main/TradeRecord_Admin.js

@@ -31,76 +31,76 @@ layui.config({
     //- 筛选条件-日期
     var laydate = layui.laydate;
     var layCreateDate = laydate.render({
-elem: '#CreateDate',
-type: 'date',
-range: true,
-trigger: 'click',
-change: function (value, date, endDate) {
-var op = true;
-if (date.year == endDate.year && endDate.month - date.month <= 1) {
-if (endDate.month - date.month == 1 && endDate.date > date.date) {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#CreateDate').val(value);
-}
-}
-});
-var layTradeDate = laydate.render({
-elem: '#TradeDate',
-trigger: 'click',
-type: 'date',
-range: true,
-change: function (value, date, endDate) {
-var op = true;
-if (date.year == endDate.year && endDate.month - date.month <= 1) {
-if (endDate.month - date.month == 1 && endDate.date > date.date) {
-op = false;
-layTradeDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layTradeDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#TradeDate').val(value);
-}
-}
-});
+        elem: '#CreateDate',
+        type: 'date',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layCreateDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateDate').val(value);
+            }
+        }
+    });
+    var layTradeDate = laydate.render({
+        elem: '#TradeDate',
+        trigger: 'click',
+        type: 'date',
+        range: true,
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layTradeDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layTradeDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#TradeDate').val(value);
+            }
+        }
+    });
 
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
+        excel.importExcel(files, {}, function (data) {
             ExcelData = data[0].sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/TradeRecord/Sort?r=" + Math.random(1),
@@ -111,35 +111,34 @@ $('#TradeDate').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/TradeRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-
-            
-            ,{field:'MakerCode', width: 200, title:'创客编码', sort: true}
-            ,{field:'RealName', width: 200, title:'创客姓名', sort: true}
-            ,{field:'TopMakerCode', width: 200, title:'顶级创客编码', sort: true}
-            ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
-            ,{field:'MerchantNo', width: 200, title:'商户编号', sort: true}
-            ,{field:'MerchantName', width: 200, title:'商户名称', sort: true}
-            ,{field:'MerMakerCode', width: 200, title:'商户直属创客编号', sort: true}
-            ,{field:'MerRealName', width: 200, title:'商户直属创客姓名', sort: true}
-            ,{field:'MerNo', width: 200, title:'快钱商户编号', sort: true}
-            ,{field:'MerBuddyType', width: 200, title:'商户创客类型', sort: true}
-            ,{field:'SnNo', width: 200, title:'快钱SN号', sort: true}
-            ,{field:'MerHelpFlag', width: 200, title:'是否属于扶持周期内商户', sort: true}
-            ,{field:'HelpMonthCount', width: 200, title:'扶持第几个月', sort: true}
-            ,{field:'TradeDate', width: 200, title:'交易日期', sort: true}
-            ,{field:'TradeSerialNo', width: 200, title:'交易流水号', sort: true}
-            ,{field:'TradeAmount', width: 200, title:'交易金额(元)', sort: true}
-            ,{field:'BankCardType', width: 200, title:'银行卡类型', sort: true}
-            ,{field:'CapFlag', width: 200, title:'借记卡封顶交易标志', sort: true}
-            ,{field:'QrPayFlag', width: 200, title:'云闪付标识', sort: true}
-            ,{field:'DirectFlag', width: 200, title:'是否直营', sort: true}
+            , { field: 'MakerCode', width: 200, title: '创客编码', sort: true }
+            , { field: 'RealName', width: 200, title: '创客姓名', sort: true }
+            , { field: 'TopMakerCode', width: 200, title: '顶级创客编码', sort: true }
+            , { field: 'TopRealName', width: 200, title: '顶级创客名称', sort: true }
+            , { field: 'MerchantNo', width: 200, title: '商户编号', sort: true }
+            , { field: 'MerchantName', width: 200, title: '商户名称', sort: true }
+            , { field: 'MerMakerCode', width: 200, title: '商户直属创客编号', sort: true }
+            , { field: 'MerRealName', width: 200, title: '商户直属创客姓名', sort: true }
+            , { field: 'MerNo', width: 200, title: '快钱商户编号', sort: true }
+            , { field: 'MerBuddyType', width: 200, title: '商户创客类型', sort: true }
+            , { field: 'SnNo', width: 200, title: '快钱SN号', sort: true }
+            , { field: 'MerHelpFlag', width: 200, title: '是否属于扶持周期内商户', sort: true }
+            , { field: 'HelpMonthCount', width: 200, title: '扶持第几个月', sort: true }
+            // ,{field:'TradeDate', width: 200, title:'交易日期', sort: true}
+            , { field: 'CreateDate', width: 200, title: '交易日期', sort: true }
+            , { field: 'TradeSerialNo', width: 200, title: '交易流水号', sort: true }
+            , { field: 'TradeAmount', width: 200, title: '交易金额(元)', sort: true }
+            , { field: 'BankCardType', width: 200, title: '银行卡类型', sort: true }
+            , { field: 'CapFlag', width: 200, title: '借记卡封顶交易标志', sort: true }
+            , { field: 'QrPayFlag', width: 200, title: '云闪付标识', sort: true }
+            , { field: 'DirectFlag', width: 200, title: '是否直营', sort: true }
         ]]
         , where: {
             BrandId: BrandId
@@ -166,7 +165,7 @@ $('#TradeDate').val(value);
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -189,20 +188,20 @@ $('#TradeDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -213,7 +212,7 @@ $('#TradeDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/TradeRecord/Edit?r=" + Math.random(1),
@@ -302,20 +301,20 @@ $('#TradeDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -326,7 +325,7 @@ $('#TradeDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/TradeRecord/Add?r=" + Math.random(1),
@@ -381,9 +380,9 @@ $('#TradeDate').val(value);
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -410,9 +409,9 @@ $('#TradeDate').val(value);
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";

wwwroot/layuiadmin/modules_main/UserAccount_Admin.js

@@ -107,10 +107,11 @@ layui.config({
                 { field: 'FreezeAmount', width: 200, title: '冻结金额' ,sort: true},
                 { field: 'BalanceAmount', width: 200, title: '余额' ,sort: true},
                 { field: 'AccountStatusName', width: 200, title: '账户状态' ,sort: true},
+                { field: 'SeoDescription', width: 200, title: '备注' ,sort: true},
                 { field: 'CreateDate', width: 200, title: '创建时间' ,sort: true},
                 {
                     title: '操作',
-                    width: 200,
+                    width: 400,
                     align: 'center',
                     fixed: 'right',
                     toolbar: '#table-list-tools'
@@ -214,6 +215,62 @@ layui.config({
                 }
             });
             layer.full(perContent);
+        } else if (obj.event === 'closeRemark') {
+            var tr = $(obj.tr);
+            var perContent = layer.open({
+                type: 2,
+                title: '创客账户冻结备注',
+                content: 'CloseRemark?Id=' + data.Id + '',
+                maxmin: true,
+                area: ['510px', '300px'],
+                btn: ['确定', '取消'],
+                yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index],
+                        submitID = 'LAY-list-front-submit',
+                        submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/UserAccount/CloseRemark?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                layer.close(index); //关闭弹层
+                                if (data == "success") {
+                                    table.reload('LAY-list-manage'); //数据刷新
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                },
+                success: function (layero, index) {
+
+                }
+            });
         } else if (obj.event === 'Open') {
             var index = layer.confirm('是否确定解冻' + data.RealName + '的账户，恢复他提现?', function (index) {
                 $.ajax({
@@ -234,7 +291,8 @@ layui.config({
                 });
             });
         } else if (obj.event === 'Close') {
-            var index = layer.confirm('是否确定冻结' + data.RealName + '的账户，禁止他提现?', function (index) {
+            var index = layer.confirm('是否确定冻结' + data.RealName + '的账户，禁止他提现?', function (index)
+            {
                 $.ajax({
                     type: "POST",
                     url: "/Admin/UserAccount/Close?r=" + Math.random(1),

wwwroot/layuiadmin/modules_main/UserStoreChange_Admin.js

@@ -132,21 +132,6 @@ $('#CreateDate').val(value);
             $("#NotPutBindCount").text(res.other.NotPutBindCount);
             $("#PutNotBindCount").text(res.other.PutNotBindCount);
             $("#PutBindCount").text(res.other.PutBindCount);
-
-            $("#NotPutNotBindCount2").text(res.other.NotPutNotBindCount2);
-            $("#NotPutBindCount2").text(res.other.NotPutBindCount2);
-            $("#PutNotBindCount2").text(res.other.PutNotBindCount2);
-            $("#PutBindCount2").text(res.other.PutBindCount2);
-            
-            $("#NotPutNotBindCount3").text(res.other.NotPutNotBindCount3);
-            $("#NotPutBindCount3").text(res.other.NotPutBindCount3);
-            $("#PutNotBindCount3").text(res.other.PutNotBindCount3);
-            $("#PutBindCount3").text(res.other.PutBindCount3);
-            
-            $("#NotPutNotBindCount4").text(res.other.NotPutNotBindCount4);
-            $("#NotPutBindCount4").text(res.other.NotPutBindCount4);
-            $("#PutNotBindCount4").text(res.other.PutNotBindCount4);
-            $("#PutBindCount4").text(res.other.PutBindCount4);
             
             $(".layui-none").text("无数据");
         }