调整

AppStart/Redis/RedisDbconn.cs

@@ -1,4 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using CSRedis;
 using Library;
 using System.Linq;
 
@@ -10,12 +14,16 @@ namespace MySystem
         public static CSRedis.CSRedisClient csredis;
         private RedisDbconn()
         {
+            if (csredis == null)
+            {
+                csredis = new CSRedis.CSRedisClient(ConfigurationManager.AppSettings["RedisConnStr"].ToString());
+            }
         }
 
         #region 设置单个字段
-        public bool Set(string key, object value)
+        public bool Set(string key, object value, int sec = -1)
         {
-            return csredis.Set(key, value);
+            return csredis.Set(key, value, sec);
             // return false;
         }
         #endregion
@@ -92,6 +100,11 @@ namespace MySystem
             return csredis.LPush(key, value);
             // return 0;
         }
+        public long AddRightList(string key, object value)
+        {
+            return csredis.RPush(key, value);
+            // return 0;
+        }
         public T RPop<T>(string key)
         {
             return csredis.RPop<T>(key);
@@ -118,6 +131,13 @@ namespace MySystem
         }
         #endregion
 
+        #region 判断元素是否存在
+        public bool SIsMember(string key, object value)
+        {
+            return csredis.SIsMember(key, value);
+        }
+        #endregion
+
         #region 修改列表对象
         public bool SetList(string key, int index, object value)
         {
@@ -137,16 +157,6 @@ namespace MySystem
         }
         #endregion
 
-        #region 删除列表元素
-        public void DelList<T>(string key, T item)
-        {
-            List<T> oldlist = GetList<T>(key, 1, 10000000);
-            oldlist.Remove(item);
-            Clear(key);
-            AddList(key, oldlist.ToArray());
-        }
-        #endregion
-
         #region 添加排序列表对象
         public long AddSort(string key, object value, decimal score)
         {
@@ -163,7 +173,7 @@ namespace MySystem
             string[] list = csredis.ZRangeByScore(key, start, end);
             List<T> lists = new List<T>();
             foreach (string record in list)
-            { 
+            {
                 lists.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<T>(record));
             }
             return lists;
@@ -175,7 +185,7 @@ namespace MySystem
             string[] list = csredis.ZRevRangeByScore(key, start, end);
             List<T> lists = new List<T>();
             foreach (string record in list)
-            { 
+            {
                 lists.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<T>(record));
             }
             return lists;
@@ -189,7 +199,7 @@ namespace MySystem
 
         public bool RemoveTop(string key, long count)
         {
-            return RedisDbconn.Instance.Remove(key, count, RedisDbconn.Instance.Count(key) - 1);;
+            return RedisDbconn.Instance.Remove(key, count, RedisDbconn.Instance.Count(key) - 1); ;
         }
 
         public long Count(string key)
@@ -204,7 +214,7 @@ namespace MySystem
         }
 
         public string[] GetKeys(string pattern)
-        { 
+        {
             string[] keys = csredis.Keys(pattern);
             return keys;
         }
@@ -217,11 +227,87 @@ namespace MySystem
         public bool HExists(string key, string field)
         {
             return csredis.HExists(key, field);
-        } 
+        }        
 
         public void SetExpire(string key, int expire)
-        { 
+        {
             csredis.Expire(key, expire); //秒为单位
         }
+
+
+
+
+        /// <summary>
+        /// 锁key
+        /// </summary>
+        private readonly string lockKey = "RedisLock";
+        /// <summary>
+        /// 锁的过期秒数
+        /// </summary>
+        private readonly int lockTime = 20;
+        /// <summary>
+        /// 续命线程取消令牌
+        /// </summary>
+        private CancellationTokenSource tokenSource = new CancellationTokenSource();
+
+        /// <summary>
+        /// 获取锁
+        /// </summary>
+        /// <param name="requestId">请求id保证释放锁时的客户端和加锁的客户端一致</param>
+        /// <returns></returns>
+        public bool GetLock(string requestId)
+        {
+            //设置key 设置过期时间20s
+            while (true)
+            {
+                //设置key Redis2.6.12以上版本，可以用set获取锁。set可以实现setnx和expire，这个是原子操作
+                if (csredis.Set(lockKey, requestId, lockTime, RedisExistence.Nx))
+                {
+                    //设置成功后开启子线程为key续命
+                    CreateThredXm();
+                    return true;
+                }
+            }
+        }
+        /// <summary>
+        /// 为锁续命(防止业务操作时间大于锁自动释放时间，锁被自动释放掉)
+        /// </summary>
+        void CreateThredXm()
+        {
+            Task.Run(() =>
+            {
+                while (true)
+                {
+                    Thread.Sleep(10);
+                    //外部取消 退出子线程
+                    if (tokenSource.IsCancellationRequested)
+                    {
+                        return;
+                    }
+                    //查询key还有多少秒释放
+                    var Seconds = csredis.PTtl(lockKey) / 1000;
+                    //key还剩1/3秒时重设过期时间
+                    if (Seconds < (lockTime / 3))
+                    {
+                        //小于5秒则自动 重设过期时间
+                        csredis.Expire(lockKey, lockTime);
+                    }
+                }
+            }, tokenSource.Token);
+        }
+        /// <summary>
+        /// 释放锁操作
+        /// </summary>
+        /// <param name="requestId">请求id保证释放锁时的客户端和加锁的客户端一致</param>
+        public void ReleaseLock(string requestId)
+        {
+            //这里使用Lua脚本保证原子性操作
+            string script = "if  redis.call('get', KEYS[1]) == ARGV[1] then " +
+                    "return redis.call('del', KEYS[1]) " +
+                    "else return 0 end";
+            csredis.Eval(script, lockKey, requestId);
+            //取消续命线程
+            tokenSource.Cancel();
+        }
     }
-}
+}

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -52,7 +52,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 仓库列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(StoreHouse data, string UserIdMakerCode, string UserIdRealName, string ManageUserIdRealName, string ManageUserIdMobile, string ManageUserIdMakerCode, string StoreStatusSelect, string CreateDateData, string MakerCode, string YZOpCode, string OpStatusSelect, int ShowFlag = 0, int page = 1, int limit = 30)
+        public JsonResult IndexData(StoreHouse data, string UserIdMakerCode, string UserIdRealName, string ManageUserIdRealName, string ManageUserIdMobile, string ManageUserIdMakerCode, string StoreStatusSelect, string CreateDateData, string MakerCode, string YZOpCode, string OpStatusSelect, string StoreKindSelect, int ShowFlag = 0, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -66,7 +66,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return Json(objs);
             }
 
-            string condition = " and Status>-1 and Sort=0";
+            string condition = " and Status>-1";
             //仓库归属人创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
@@ -172,6 +172,19 @@ namespace MySystem.Areas.Admin.Controllers
 
                 }
             }
+            //是否运营仓
+            if (!string.IsNullOrEmpty(StoreKindSelect))
+            {
+                if (int.Parse(StoreKindSelect) > 0)
+                {
+                    condition += " and OpId>0 and StoreKind=2";
+                }
+                else
+                {
+                    condition += " and OpId>0 and StoreKind!=2";
+
+                }
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("StoreHouse", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -202,6 +215,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int StoreKind = int.Parse(dic["StoreKind"].ToString());
                 if (StoreKind == 0) dic["StoreKind"] = "分仓";
                 if (StoreKind == 1) dic["StoreKind"] = "总仓";
+                if (StoreKind == 2) dic["StoreKind"] = "运营仓";
                 //小分仓
                 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);
@@ -307,6 +321,16 @@ namespace MySystem.Areas.Admin.Controllers
                     }
 
                     int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("StoreHouse", Fields, 0);
+                    //添加分仓创建时间
+                    var users = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
+                    if (users.Id > 0)
+                    {
+                        if (string.IsNullOrEmpty(users.CreateStoreDate.ToString()))
+                        {
+                            users.CreateStoreDate = DateTime.Now;
+                            db.SaveChanges();
+                        }
+                    }
                     StoreHouse edit = db.StoreHouse.FirstOrDefault(m => m.Id == Id);
                     if (edit != null)
                     {
@@ -513,6 +537,16 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("Status", 1);
 
             int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("StoreHouse", Fields, 0);
+            //添加分仓创建时间
+            var users = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
+            if (users.Id > 0)
+            {
+                if (string.IsNullOrEmpty(users.CreateStoreDate.ToString()))
+                {
+                    users.CreateStoreDate = DateTime.Now;
+                    db.SaveChanges();
+                }
+            }
             StoreHouse edit = db.StoreHouse.FirstOrDefault(m => m.Id == Id);
             if (edit != null)
             {
@@ -1477,7 +1511,7 @@ namespace MySystem.Areas.Admin.Controllers
                 var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.UserId == userForMakerCode.UserId) ?? new OpModels.SysAdmin();
                 if (sysAdmin.Id > 0)
                 {
-                    DataTable dt = OtherMySqlConn.dtable("UPDATE StoreHouse SET OpId=" + sysAdmin.UserId + " WHERE Id IN (" + Id + ") AND OpId =" + sysAdmin.UserId + " AND `Status` >0");
+                    DataTable dt = OtherMySqlConn.dtable("UPDATE StoreHouse SET OpId=" + sysAdmin.UserId + " WHERE Id IN (" + Id + ") AND StoreKind!=2 AND `Status` >0");
                     // new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreHouse", Fields, pos.Id);
                     db.SaveChanges();
                     foreach (var item in idlist)
@@ -1485,7 +1519,7 @@ namespace MySystem.Areas.Admin.Controllers
                         int StoreId = int.Parse(item);
                         var amount = 0;
                         var tamount = 0;
-                        var storeInfo = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId);
+                        var storeInfo = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId && m.StoreKind != 2);
                         var posCount = db.PosMachinesTwo.Where(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.PreUserId == 0).Count();
                         var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == int.Parse(storeInfo.BrandId));
                         if (brandInfo.Name.Contains("电签"))
@@ -1500,24 +1534,36 @@ namespace MySystem.Areas.Admin.Controllers
                         var userAmount = opdb.UserAccount.FirstOrDefault(m => m.Sort == sysAdmin.Id) ?? new OpModels.UserAccount();
                         userAmount.ValidAmount -= tamount;//扣减关联分仓机具占用额度
                         userAmount.ValidAmount += storeInfo.Deposit;//增加关联分仓押金
-                        storeInfo.OpId = sysAdmin.Id;
+                        // storeInfo.OpId = sysAdmin.UserId;
                         db.SaveChanges();
                         opdb.SaveChanges();
-                        var query = opdb.StoreForOperate.FirstOrDefault(m => m.OpId == sysAdmin.Id && m.StoreId == StoreId && m.Status > -1);
+                        var query = opdb.StoreForOperate.FirstOrDefault(m => m.OpId == sysAdmin.UserId && m.StoreId == StoreId && m.Sort == 0 && m.QueryCount == storeInfo.UserId && m.Status == 0);
                         if (query == null)
                         {
                             var user = db.Users.FirstOrDefault(m => m.Id == storeInfo.UserId) ?? new Users();
                             query = opdb.StoreForOperate.Add(new OpModels.StoreForOperate()
                             {
                                 CreateDate = DateTime.Now, //创建时间
-                                Sort = storeInfo.UserId,//分仓所属人Id
+                                CreateMan = SysUserName + "_" + SysRealName,
+                                QueryCount = storeInfo.UserId,//分仓所属人Id
                                 SeoTitle = user.MakerCode,
-                                SeoKeyword = storeInfo.StoreNo + "_" + storeInfo.StoreName,
+                                SeoKeyword = storeInfo.StoreNo,
+                                SeoDescription = storeInfo.StoreName,
                                 OpId = sysAdmin.UserId,
                                 StoreId = StoreId,
                             }).Entity;
                             opdb.SaveChanges();
                         }
+                        //添加分仓创建时间
+                        var users = db.Users.FirstOrDefault(m => m.Id == storeInfo.UserId) ?? new Users();
+                        if (users.Id > 0)
+                        {
+                            if (string.IsNullOrEmpty(users.CreateStoreDate.ToString()))
+                            {
+                                users.CreateStoreDate = DateTime.Now;
+                                db.SaveChanges();
+                            }
+                        }
                     }
                     sysAdmin.StoreCount += idlist.Count();//添加关联分仓数
                     opdb.SaveChanges();
@@ -1567,7 +1613,7 @@ namespace MySystem.Areas.Admin.Controllers
                     foreach (var item in idlist)
                     {
                         int StoreId = int.Parse(item);
-                        var store = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId);
+                        var store = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId && m.StoreKind != 2);
                         if (store != null && store.OpId != sysAdmin.UserId)
                         {
                             error += "分仓" + store.StoreNo + "未在创客" + MakerCode + "的关联分仓中";
@@ -1579,13 +1625,13 @@ namespace MySystem.Areas.Admin.Controllers
                         return "Warning|" + error;
                     }
 
-                    DataTable dt = OtherMySqlConn.dtable("UPDATE StoreHouse SET OpId=0 WHERE Id IN (" + Id + ") AND OpId =" + sysAdmin.UserId + " AND `Status` >0");
+                    DataTable dt = OtherMySqlConn.dtable("UPDATE StoreHouse SET OpId=0 WHERE Id IN (" + Id + ") AND OpId =" + sysAdmin.UserId + " AND StoreKind!=2 AND `Status` >0");
                     // new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreHouse", Fields, pos.Id);
                     db.SaveChanges();
                     foreach (var item in idlist)
                     {
                         int StoreId = int.Parse(item);
-                        var store = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId);
+                        var store = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId && m.StoreKind != 2);
                         if (store != null && store.OpId != sysAdmin.UserId)
                         {
                             return "分仓" + store.StoreNo + "未在创客" + MakerCode + "的关联分仓中";
@@ -1608,13 +1654,24 @@ namespace MySystem.Areas.Admin.Controllers
                         userAmount.ValidAmount += tamount;//增加关联分仓机具占用额度
                         userAmount.ValidAmount -= storeInfo.Deposit;//扣减关联分仓押金
                         opdb.SaveChanges();
-                        var query = opdb.StoreForOperate.FirstOrDefault(m => m.OpId == sysAdmin.UserId && m.StoreId == StoreId);
+                        var query = opdb.StoreForOperate.FirstOrDefault(m => m.Status == 0 && m.OpId == sysAdmin.UserId && m.StoreId == StoreId && m.Sort == 0 && m.QueryCount == store.UserId);
                         if (query != null)
                         {
                             query.UpdateDate = DateTime.Now;
+                            query.UpdateMan = SysUserName + "_" + SysRealName;
                             query.Status = -1;
                             opdb.SaveChanges();
                         }
+                        //取消分仓创建时间
+                        var users = db.Users.FirstOrDefault(m => m.Id == storeInfo.UserId) ?? new Users();
+                        if (users.Id > 0)
+                        {
+                            if (string.IsNullOrEmpty(users.CreateStoreDate.ToString()))
+                            {
+                                users.CreateStoreDate = null;
+                                db.SaveChanges();
+                            }
+                        }
                     }
                     sysAdmin.StoreCount -= idlist.Count();//减少关联分仓数
                     opdb.SaveChanges();

Areas/Admin/Controllers/OperateServer/StoreMachineApplyOperateController.cs

@@ -110,7 +110,7 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
-         #region 运营中心机具券申请记录列表
+        #region 运营中心机具券申请记录列表
 
         /// <summary>
         /// 根据条件查询运营中心机具券申请记录列表
@@ -258,9 +258,10 @@ namespace MySystem.Areas.Admin.Controllers
 
             Models.WebCMSEntities db = new Models.WebCMSEntities();
             // Users users = db.Users.FirstOrDefault(m => m.Id == editData.UserId) ?? new Users();
-            SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == editData.UserId) ?? new SysAdmin();
+            SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Status == 0 && m.UserId == editData.UserId) ?? new SysAdmin();
             ViewBag.UserId = sysAdmin.Id;
-            ViewBag.RealName = sysAdmin.RealName;
+            ViewBag.MakerCode = sysAdmin.MakerCode;
+            ViewBag.MakerName = sysAdmin.MakerName;
             ViewBag.UseAmount = editData.UseAmount;
             JsonData SendSnList = new JsonData();
             SendSnList = JsonMapper.ToObject(editData.SendSn);//申请数据
@@ -388,9 +389,25 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 2);
-                var query = db.StoreMachineApply.FirstOrDefault(m => m.Id == id);
-                var users = db.UserAccount.FirstOrDefault(m => m.Id == query.UserId);
-                users.ValidAmount += query.UseAmount;
+                var query = opdb.StoreMachineApply.FirstOrDefault(m => m.Id == id);
+                var users = opdb.UserAccount.FirstOrDefault(m => m.Status == 0 && m.UserId == query.UserId) ?? new UserAccount();
+                if (users.Id > 0)
+                {
+                    users.ValidAmount += query.UseAmount;
+                    var amountRecord = opdb.AmountRecord.Add(new AmountRecord()
+                    {
+                        CreateDate = DateTime.Now,
+                        CreateMan = SysUserName + "-" + SysRealName,
+                        SeoDescription = "机具申请驳回",
+                        OperateType = 1,//增加
+                        BeforeAmount = users.ValidAmount,
+                        AfterAmount = users.ValidAmount + query.UseAmount,
+                        UseAmount = query.UseAmount,
+                        UserId = query.UserId,
+                        ApplyId = query.Id,
+                    }).Entity;
+                    opdb.SaveChanges();
+                }
                 new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("StoreMachineApply", Fields, id);
             }
             db.SaveChanges();
@@ -524,7 +541,7 @@ namespace MySystem.Areas.Admin.Controllers
             StoreMachineApply editData = opdb.StoreMachineApply.FirstOrDefault(m => m.Id == Id) ?? new StoreMachineApply();
             ViewBag.data = editData;
 
-            SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == editData.UserId) ?? new SysAdmin();
+            SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Status == 0 && m.UserId == editData.UserId) ?? new SysAdmin();
             // Users users = db.Users.FirstOrDefault(m => m.Id == editData.UserId) ?? new Users();
             ViewBag.OpCode = sysAdmin.OpCode;
             ViewBag.MakerCode = sysAdmin.MakerCode;
@@ -720,7 +737,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (BrandId == 7) FromStoreId = 1047;
                 if (BrandId == 8) FromStoreId = 4831;
                 if (BrandId == 9) FromStoreId = 4832;
-                tostore = db.StoreHouse.FirstOrDefault(m => m.Sort == apply.UserId && m.BrandId == BrandId.ToString() && m.Status > -1);
+                tostore = db.StoreHouse.FirstOrDefault(m => m.Sort > 0 && m.UserId == apply.UserId && m.BrandId == BrandId.ToString() && m.Status == 1);
                 SendInfo item = sendInfos.FirstOrDefault(m => m.FromStoreId == FromStoreId && m.ToStoreId == tostore.Id && m.BrandId == BrandId);
                 if (item == null)
                 {
@@ -741,7 +758,7 @@ namespace MySystem.Areas.Admin.Controllers
                 apply.SeoDescription = function.CheckString(SnNo) + ',';
 
                 fromstore = db.StoreHouse.FirstOrDefault(m => m.Id == FromStoreId);
-                tostore = db.StoreHouse.FirstOrDefault(m => m.Sort == apply.UserId && m.BrandId == BrandId.ToString() && m.Status > -1);
+                // tostore = db.StoreHouse.FirstOrDefault(m => m.Sort > 0 && m.UserId == apply.UserId && m.BrandId == BrandId.ToString() && m.Status == 1);
 
                 Models.MachineForSnNo machinefor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new Models.MachineForSnNo();
                 Models.PosMachinesTwo machine = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machinefor.SnId && m.BuyUserId == 0 && m.UserId == 0) ?? new Models.PosMachinesTwo();
@@ -817,6 +834,7 @@ namespace MySystem.Areas.Admin.Controllers
 
                         //添加机具所属运营中心
                         machine.OpId = tostore.UserId;
+                        db.SaveChanges();
                     }
                 }
                 else

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -206,6 +206,7 @@ namespace MySystem.Areas.Admin.Controllers
                         Field.Add("TotalAmt", userAccount.TotalAmt); //初始额度
                         Field.Add("ValidAmount", userAccount.TotalAmt); //可用额度
                         Field.Add("Sort", Id); //运营中心Id
+                        Field.Add("Id", edit.UserId); //创客Id
                         Field.Add("UserId", edit.UserId); //创客Id
                         int Ids = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Add("UserAccount", Field, 0);
                         AddSysLog(userAccount.Id.ToString(), "UserAccount", "add");
@@ -215,7 +216,7 @@ namespace MySystem.Areas.Admin.Controllers
                             Sort = edit.Id,//所属运营中心
                             CreateMan = SysUserName + "_" + SysRealName,
                             Details = "运营中心管理员，可以操作运营中心所有权限",
-                            RightInfo = ",1_1,1_1_1,1_1_1_edit,1_2,1_2_1,1_2_1_export,1_3,1_3_1,1_3_1_import,1_4,1_4_1,1_4_1_add,1_4_2,1_4_2_add,1_6,1_6_1,1_6_1_add,1_6_1_delete,1_6_1_edit,1_6_2,1_6_2_add,1_6_2_delete,1_6_2_edit,",
+                            RightInfo = ",1_1,1_1_1,1_1_1_edit,1_2,1_2_1,1_2_2,1_2_1_export,1_3,1_3_1,1_3_1_import,1_4,1_4_1,1_4_1_add,1_4_2,1_4_2_add,1_6,1_6_1,1_6_1_add,1_6_1_delete,1_6_1_edit,1_6_2,1_6_2_add,1_6_2_delete,1_6_2_edit,",
                             Name = "运营中心管理员",
 
                         }).Entity;
@@ -240,6 +241,7 @@ namespace MySystem.Areas.Admin.Controllers
                             CreateMan = SysUserName + "_" + SysRealName,
                             ManageMobile = data.MakerMobile, //手机号
                             UserId = info.UserId, //运营中心创客Id
+                            OpId = info.UserId, //运营中心创客Id
                             Address = Address,//仓库地址
                             Areas = Areas,//所属地区
                             ManageUserId = info.UserId,//仓库管理员
@@ -251,6 +253,18 @@ namespace MySystem.Areas.Admin.Controllers
 
                         }).Entity;
                         db.SaveChanges();
+
+                        var querys = opdb.StoreForOperate.Add(new OpModels.StoreForOperate()
+                        {
+                            CreateDate = DateTime.Now, //创建时间
+                            CreateMan = SysUserName + "_" + SysRealName,
+                            Sort = info.UserId,
+                            OpId = info.UserId,
+                            StoreId = query.Id,
+                            SeoKeyword = query.StoreNo,
+                            SeoDescription = query.StoreName,
+                        }).Entity;
+                        opdb.SaveChanges();
                     }
                 }
                 else
@@ -295,81 +309,23 @@ namespace MySystem.Areas.Admin.Controllers
         public string Edit(SysAdmin data, UserAccount userAccount, string Areas, string Address)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Dictionary<string, object> Field = new Dictionary<string, object>();
-
-            Models.WebCMSEntities db = new Models.WebCMSEntities();
-            var userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == data.MakerCode) ?? new Models.UserForMakerCode();
-            if (userForMakerCode.UserId > 0)
+            Fields.Add("UpdateMan", SysUserName + "_" + SysRealName); //修改人
+            Fields.Add("RealName", data.RealName); //运营中心名称
+            Fields.Add("FilePath", data.FilePath); //附件
+            Fields.Add("AdminName", data.AdminName); //用户名
+            if (!string.IsNullOrEmpty(data.Password)) //密码不为空就修改密码，否则不操作
             {
-                var userInfo = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId && m.Mobile == data.MakerMobile) ?? new Models.Users();
-                if (userInfo.Id > 0)
-                {
-                    var checks = opdb.SysAdmin.Any(m => m.UserId == userInfo.Id);
-                    if (checks)
-                    {
-                        return "该用户已存在运营中心，请重新输入";
-                    }
-                    Fields.Add("UpdateMan", SysUserName + "_" + SysRealName); //修改人
-                    Fields.Add("RealName", data.RealName); //运营中心名称
-                    Fields.Add("MakerCode", data.MakerCode); //创客编号
-                    Fields.Add("MakerMobile", data.MakerMobile); //手机号
-                    Fields.Add("AdminName", data.AdminName); //用户名
-                    Fields.Add("UserId", userInfo.Id); //创客Id
-                    Fields.Add("MakerName", userInfo.RealName); //创客真实姓名
-                    if (!string.IsNullOrEmpty(data.Password)) //密码不为空就修改密码，否则不操作
-                    {
-                        var sys = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
-                        if (data.Password != sys.Password)
-                        {
-                            Fields.Add("Password", function.MD5_32(data.Password)); //密码
-                        }
-                    }
-                    Fields.Add("FilePath", data.FilePath); //附件
-                    Field.Add("TotalAmt", userAccount.TotalAmt); //初始额度
-                    Field.Add("ValidAmount", userAccount.TotalAmt); //可用额度
-                    Field.Add("Sort", data.Id); //运营中心Id
-                    Field.Add("UserId", userInfo.Id); //创客Id
-                    var suser = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
-                    var user = db.Users.FirstOrDefault(m => m.Id == suser.UserId) ?? new Models.Users();
-                    if (user.Id > 0)
-                    {
-                        user.UserType = 0;//取消运营中心标记
-                        var storeHouse = db.StoreHouse.Where(m => m.Sort == data.Id && m.Status == 1).ToList();
-                        foreach (var item in storeHouse)
-                        {
-                            var list = db.StoreHouse.FirstOrDefault(m => m.Sort == item.Sort && m.Status == 1 && m.UserId == user.Id) ?? new Models.StoreHouse();
-                            if (list.Id > 0)
-                            {
-                                list.UserId = userInfo.Id;
-                                list.ManageUserId = userInfo.Id;
-                                list.ManageMobile = userInfo.Mobile;
-                                list.UpdateDate = DateTime.Now;
-                                list.UpdateMan = SysUserName + "-" + SysRealName;
-                                db.SaveChanges();
-                            }
-                        }
-                        db.SaveChanges();
-                    }
-                    new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("SysAdmin", Fields, data.Id);
-                    SysAdmin edit = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
-                    edit.CreateDate = edit.CreateDate;
-                    AddSysLog(data.Id.ToString(), "SysAdmin", "update");
-                    opdb.SaveChanges();
-                    new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("UserAccount", Field, userAccount.Id);
-                    UserAccount edits = opdb.UserAccount.FirstOrDefault(m => m.Sort == data.Id);
-                    edits.CreateDate = edits.CreateDate;
-                    edits.UserId = userInfo.Id;
-                    AddSysLog(userAccount.Id.ToString(), "UserAccount", "update");
-                    opdb.SaveChanges();
-
-                    userInfo.UserType = 1;//设置创客为运营中心
-                    db.SaveChanges();
-                }
-                else
+                var sys = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
+                if (data.Password != sys.Password)
                 {
-                    return "创客编号和手机号不匹配";
+                    Fields.Add("Password", function.MD5_32(data.Password)); //密码
                 }
             }
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("SysAdmin", Fields, data.Id);
+            SysAdmin edit = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
+            edit.CreateDate = edit.CreateDate;
+            AddSysLog(data.Id.ToString(), "SysAdmin", "update");
+            db.SaveChanges();
 
             return "success";
         }
@@ -389,23 +345,72 @@ namespace MySystem.Areas.Admin.Controllers
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
-                var storeHouse = db.StoreHouse.Where(m => m.Sort == id && m.Status == 1).ToList();
-                foreach (var item in storeHouse)
-                {
-                    var list = db.StoreHouse.FirstOrDefault(m => m.Sort == id && m.Status == 1) ?? new Models.StoreHouse();
-                    if (list.Id > 0)
-                    {
-                        list.Status = -1;
-                        list.UpdateDate = DateTime.Now;
-                        list.UpdateMan = SysUserName + "-" + SysRealName;
-                        db.SaveChanges();
-                    }
-                }
                 var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == id) ?? new OpModels.SysAdmin();
                 if (sysAdmin.Id > 0)
                 {
-                    var userAccount = opdb.UserAccount.FirstOrDefault(m => m.Status > -1 && m.Sort == id && m.UserId == sysAdmin.UserId);
-                    userAccount.Status = -1;
+                    var userAccount = opdb.UserAccount.FirstOrDefault(m => m.Status > -1 && m.Sort == id && m.UserId == sysAdmin.UserId) ?? new OpModels.UserAccount();
+                    if (userAccount.Id > 0)
+                    {
+                        userAccount.Status = -1;
+                    }
+                    var operateForCode = opdb.OperateForCode.FirstOrDefault(m => m.OpId == id) ?? new OpModels.OperateForCode();
+                    if (operateForCode.OpId > 0)
+                    {
+                        new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Delete("UserAccount", operateForCode.OpId);
+                    }
+                    //修改运营中心仓
+                    var storeHouse = db.StoreHouse.Where(m => m.Sort == id && m.Status == 1 && m.UserId == sysAdmin.UserId && m.OpId == sysAdmin.UserId).ToList();
+                    foreach (var item in storeHouse)
+                    {
+                        var list = storeHouse.FirstOrDefault(m => m.Id == item.Id) ?? new Models.StoreHouse();
+                        if (list.Id > 0)
+                        {
+                            list.Status = -1;
+                            list.UpdateDate = DateTime.Now;
+                            list.UpdateMan = SysUserName + "-" + SysRealName;
+                            db.SaveChanges();
+                        }
+                    }
+                    //修改运营中心关联分仓
+                    var storeHouses = db.StoreHouse.Where(m => m.Sort == id && m.Status == 1).ToList();
+                    foreach (var item in storeHouses)
+                    {
+                        var list = storeHouses.FirstOrDefault(m => m.Id == item.Id) ?? new Models.StoreHouse();
+                        if (list.Id > 0)
+                        {
+                            list.Sort = 0;
+                            list.OpId = 0;
+                            list.UpdateDate = DateTime.Now;
+                            list.UpdateMan = SysUserName + "-" + SysRealName;
+                            db.SaveChanges();
+                        }
+                    }
+                    //修改关联运营中心仓
+                    var storeForOperate = opdb.StoreForOperate.Where(m => m.Status == 0 && m.OpId == sysAdmin.UserId && m.Sort == sysAdmin.UserId && m.QueryCount == 0).ToList();
+                    foreach (var items in storeForOperate)
+                    {
+                        var lists = storeForOperate.FirstOrDefault(m => m.Id == items.Id) ?? new OpModels.StoreForOperate();
+                        if (lists.Id > 0)
+                        {
+                            lists.Status = -1;
+                            lists.UpdateDate = DateTime.Now;
+                            lists.UpdateMan = SysUserName + "-" + SysRealName;
+                            opdb.SaveChanges();
+                        }
+                    }
+                    //修改运营中心关联分仓
+                    var storeForOperates = opdb.StoreForOperate.Where(m => m.Status == 0 && m.OpId == sysAdmin.UserId && m.Sort == 0 && m.QueryCount == sysAdmin.UserId).ToList();
+                    foreach (var items in storeForOperates)
+                    {
+                        var lists = storeForOperates.FirstOrDefault(m => m.Id == items.Id) ?? new OpModels.StoreForOperate();
+                        if (lists.Id > 0)
+                        {
+                            lists.Status = -1;
+                            lists.UpdateDate = DateTime.Now;
+                            lists.UpdateMan = SysUserName + "-" + SysRealName;
+                            opdb.SaveChanges();
+                        }
+                    }
                     opdb.SaveChanges();
                 }
                 Dictionary<string, object> Fields = new Dictionary<string, object>();

Areas/Admin/Controllers/OperateServer/UserCashRecordOperateController.cs

@@ -62,7 +62,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 提现记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(UserCashRecord data, string OpCode, string StatusSelect, string QueryCountSelect, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(UserCashRecord data, string OpCode, string StatusSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -88,11 +88,6 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and TradeType=" + data.TradeType;
             }
-            //提交到代付状态
-            if (!string.IsNullOrEmpty(QueryCountSelect))
-            {
-                condition += " and QueryCount=" + QueryCountSelect;
-            }
 
             if (!string.IsNullOrEmpty(CreateDateData))
             {
@@ -362,8 +357,6 @@ namespace MySystem.Areas.Admin.Controllers
                         decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
                         decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
                         decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
-                        account.WithdrawAmount += userCashRecord.TradeAmount;
-                        account.FreezeAmount -= userCashRecord.TradeAmount;
                         decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
                         decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
                         decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
@@ -574,485 +567,69 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
 
-
-
-
-        #region 盟主提现记录列表
+        #region 拒绝
 
         /// <summary>
-        /// 根据条件查询盟主提现记录列表
+        /// 拒绝
         /// </summary>
         /// <returns></returns>
-        public IActionResult LeaderIndex(UserCashRecord data, string right)
+        public IActionResult Reduce(string right, int Id = 0)
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
 
+            UserCashRecord editData = opdb.UserCashRecord.FirstOrDefault(m => m.Id == Id) ?? new UserCashRecord();
+            ViewBag.data = editData;
 
-            string Condition = "";
-            Condition += "CashOrderNo:\"" + data.CashOrderNo + "\",";
-            Condition += "TradeType:\"" + data.TradeType + "\",";
-
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
             return View();
         }
 
         #endregion
 
-        #region 根据条件查询盟主提现记录列表
+        #region 拒绝
 
         /// <summary>
-        /// 盟主提现记录列表
+        /// 拒绝
         /// </summary>
         /// <returns></returns>
-        public JsonResult LeaderIndexData(UserCashRecord data, string MakerCode, string RealName, string StatusSelect, string QueryCountSelect, string CreateDateData, int page = 1, int limit = 30)
+        public string ReduceDo(int Id, string Remark)
         {
-
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("CashOrderNo", "1"); //提现单号
-
-            string condition = " and Status>-1 and TradeType=3";
-            //创客编号
-            if (!string.IsNullOrEmpty(MakerCode))
-            {
-                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + MakerCode + "')";
-            }
-            //创客名称
-            if (!string.IsNullOrEmpty(RealName))
-            {
-                condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
-                // condition += " and UserId in (select Id from Users where RealName='" + RealName + "')";
-            }
-            //提现状态
-            if (!string.IsNullOrEmpty(StatusSelect))
-            {
-                condition += " and Status=" + StatusSelect;
-            }
-            if (!string.IsNullOrEmpty(data.CashOrderNo))
-            {
-                condition += " and CashOrderNo='" + data.CashOrderNo + "'";
-            }
-            if (data.TradeType > 0)
-            {
-                condition += " and TradeType=" + data.TradeType;
-            }
-            //提交到代付状态
-            if (!string.IsNullOrEmpty(QueryCountSelect))
-            {
-                condition += " and QueryCount=" + QueryCountSelect;
-            }
-            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'";
-                var start = Convert.ToDateTime(Convert.ToDateTime(datelist[0]).ToString("yyyy-MM-dd"));
-                var end = Convert.ToDateTime(Convert.ToDateTime(datelist[1]).ToString("yyyy-MM-dd") + " 23:59:59");
-                var check = opdb.UserCashRecord.Any(m => m.CreateDate >= start && m.TradeType == 3);
-                var checks = opdb.UserCashRecord.Any(m => m.CreateDate <= end && m.TradeType == 3);
-                if (check)
-                {
-                    var sId = opdb.UserCashRecord.Where(m => m.CreateDate >= start && m.TradeType == 3).Min(m => m.Id);
-                    condition += "  and Id >=" + sId;
-                }
-                if (checks)
+            AddSysLog(Id, "UserCashRecord", "Reduce");
+            UserCashRecord edit = opdb.UserCashRecord.FirstOrDefault(m => m.Id == Id);
+            if (edit != null)
+            {
+                edit.Status = 2;
+                edit.Remark = Remark;
+                edit.UpdateMan = SysUserName;
+                UserAccount account = opdb.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
+                if (account != null)
                 {
-                    var eId = opdb.UserCashRecord.Where(m => m.CreateDate <= end && m.TradeType == 3).Max(m => m.Id);
-                    condition += " and Id <=" + eId;
-                }
-            }
-            else
-            {
-                // var start = DateTime.Now.ToString("yyyy-MM") + "-01";
-                // var end = Convert.ToDateTime(start).AddMonths(1);
-                // condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<'" + end + " 00:00:00'";
-
-                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01");
-                var check = opdb.UserCashRecord.Any(m => m.CreateDate >= start && m.TradeType == 3);
-                if (check)
-                {
-                    var minId = opdb.UserCashRecord.Where(m => m.CreateDate >= start && m.TradeType == 3).Min(m => m.Id);
-                    var Info = function.ReadInstance("/WritePage/UserCashRecord/LeaderUserCashRecord.txt");
-                    if (string.IsNullOrEmpty(Info.ToString()))
+                    decimal TradeAmount = edit.TradeAmount;
+                    decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                    decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                    decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                    account.BalanceAmount += TradeAmount;//返回余额
+                    decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                    decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                    decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                    opdb.UserAccountRecord.Add(new UserAccountRecord()
                     {
-                        function.WritePage("/WritePage/UserCashRecord/", "LeaderUserCashRecord.txt", minId.ToString());
-                        condition += " and Id >=" + minId;
-                    }
-                    else
-                    {
-                        condition += " and Id >=" + Convert.ToInt32(Info);
-                    }
-                }
-                else
-                {
-                    condition += " and Id =0";
-                }
-            }
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).IndexData("UserCashRecord", Fields, "Id desc", "0", page, limit, condition);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-                int UserId = int.Parse(dic["UserId"].ToString());
-                var user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Models.Users();
-                dic["MakerCode"] = user.MakerCode;
-                dic["RealName"] = user.RealName;
-                dic["TradeType"] = RelationClassForConst.GetTradeTypeInfo(int.Parse(dic["TradeType"].ToString()));
-                int Status = int.Parse(dic["Status"].ToString());
-                if (Status == 0) dic["StatusName"] = "处理中";
-                if (Status == 1) dic["StatusName"] = "成功";
-                if (Status == 2) dic["StatusName"] = "失败";
-
-                int QueryCount = int.Parse(dic["QueryCount"].ToString());
-                if (QueryCount == 0) dic["LockName"] = "待提交";
-                if (QueryCount == 1) dic["LockName"] = "已提交";
-            }
-            Dictionary<string, object> other = new Dictionary<string, object>();
-
-            string WaitAmount = "0.00";//待处理总金额
-            string SuccessAmount = "0.00";//提现成功总金额
-            string FailAmount = "0.00";//提现失败总金额
-            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(if(Status=0,TradeAmount,0)),SUM(if(Status=1,TradeAmount,0)),SUM(if(Status=2,TradeAmount,0)) FROM UserCashRecord where 1=1 " + condition);
-            if (dt.Rows.Count > 0)
-            {
-                WaitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-                SuccessAmount = decimal.Parse(function.CheckNum(dt.Rows[0][1].ToString())).ToString("f2");
-                FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][2].ToString())).ToString("f2");
-            }
-            other.Add("WaitAmount", WaitAmount);
-            other.Add("SuccessAmount", SuccessAmount);
-            other.Add("FailAmount", FailAmount);
-            obj.Add("other", other);
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 导出盟主Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult LeaderExportExcel(UserCashRecord data, string MakerCode, string RealName, string StatusSelect, string PayStatus)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("CashOrderNo", "1"); //提现单号
-            Fields.Add("CreateDate", "3"); //创建时间
-
-            string condition = " and Status>-1 and TradeType=3";
-            //创客编号
-            if (!string.IsNullOrEmpty(MakerCode))
-            {
-                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + MakerCode + "')";
-            }
-            //创客名称
-            if (!string.IsNullOrEmpty(RealName))
-            {
-                condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
-            }
-            //提现状态
-            if (!string.IsNullOrEmpty(StatusSelect))
-            {
-                condition += " and Status=" + StatusSelect;
-            }
-            //提交到代付状态
-            if (!string.IsNullOrEmpty(PayStatus))
-            {
-                int QueryCount = int.Parse(function.CheckInt(PayStatus));
-                if (QueryCount == 2)
-                {
-                    QueryCount = 0;
-                }
-                condition += " and QueryCount=" + QueryCount;
-            }
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).IndexData("UserCashRecord", Fields, "Id desc", "0", 1, 20000, condition, "CashOrderNo,UserId,IdCardNo,ActualTradeAmount,Remark,Status,QueryCount,CreateDate", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-                int UserId = int.Parse(dic["UserId"].ToString());
-                var user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Models.Users();
-                dic["MakerCode"] = user.MakerCode;
-                dic["RealName"] = user.RealName;
-                dic["Mobile"] = user.Mobile;
-                dic["SettleBankName"] = user.SettleBankName;
-                dic["SettleBankCardNo"] = user.SettleBankCardNo;
-                dic.Remove("UserId");
-                // dic["TradeType"] = RelationClassForConst.GetTradeTypeInfo(int.Parse(dic["TradeType"].ToString()));
-                int Status = int.Parse(dic["Status"].ToString());
-                if (Status == 0) dic["StatusName"] = "处理中";
-                if (Status == 1) dic["StatusName"] = "成功";
-                if (Status == 2) dic["StatusName"] = "失败";
-                dic.Remove("Status");
-
-                int QueryCount = int.Parse(dic["QueryCount"].ToString());
-                if (QueryCount == 0) dic["LockName"] = "待提交";
-                if (QueryCount == 1) dic["LockName"] = "已提交";
-                dic.Remove("QueryCount");
-            }
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("CashOrderNo", "提现单号");
-            ReturnFields.Add("MakerCode", "创客编号");
-            ReturnFields.Add("RealName", "灵工姓名");
-            ReturnFields.Add("Mobile", "手机号");
-            ReturnFields.Add("IdCardNo", "身份证号");
-            ReturnFields.Add("SettleBankName", "开户行名称");
-            ReturnFields.Add("SettleBankCardNo", "开户行卡号");
-            ReturnFields.Add("ActualTradeAmount", "发佣金额(单位：元）");
-            ReturnFields.Add("LockName", "代付标记");
-            ReturnFields.Add("StatusName", "状态");
-            ReturnFields.Add("Remark", "备注");
-            ReturnFields.Add("CreateDate", "创建时间");
-
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "UserCashRecord", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-
-        #region 助利宝提现记录列表
-
-        /// <summary>
-        /// 根据条件查询助利宝提现记录列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult HelpProfitIndex(UserCashRecord data, string right)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-
-            string Condition = "";
-            Condition += "CashOrderNo:\"" + data.CashOrderNo + "\",";
-            Condition += "TradeType:\"" + data.TradeType + "\",";
-
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
-            return View();
-        }
-
-        #endregion
-
-
-        #region
-
-        /// <summary>
-        /// 助利宝提现记录列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult HelpProfitIndexData(UserCashRecord data, string MakerCode, string RealName, string StatusSelect, string QueryCountSelect, string CreateDateData, int page = 1, int limit = 30)
-        {
-
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("CashOrderNo", "1"); //提现单号
-
-            string condition = " and Status>-1 and TradeType=4";
-            //创客编号
-            if (!string.IsNullOrEmpty(MakerCode))
-            {
-                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + MakerCode + "')";
-            }
-            //创客名称
-            if (!string.IsNullOrEmpty(RealName))
-            {
-                condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
-                // condition += " and UserId in (select Id from Users where RealName='" + RealName + "')";
-            }
-            //提现状态
-            if (!string.IsNullOrEmpty(StatusSelect))
-            {
-                condition += " and Status=" + StatusSelect;
-            }
-            if (!string.IsNullOrEmpty(data.CashOrderNo))
-            {
-                condition += " and CashOrderNo='" + data.CashOrderNo + "'";
-            }
-            if (data.TradeType > 0)
-            {
-                condition += " and TradeType=" + data.TradeType;
-            }
-            //提交到代付状态
-            if (!string.IsNullOrEmpty(QueryCountSelect))
-            {
-                condition += " and QueryCount=" + QueryCountSelect;
-            }
-            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.OpTables).IndexData("UserCashRecord", Fields, "Id desc", "0", page, limit, condition);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-                int UserId = int.Parse(dic["UserId"].ToString());
-                var user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Models.Users();
-                dic["MakerCode"] = user.MakerCode;
-                dic["RealName"] = user.RealName;
-                dic["TradeType"] = RelationClassForConst.GetTradeTypeInfo(int.Parse(dic["TradeType"].ToString()));
-                int Status = int.Parse(dic["Status"].ToString());
-                if (Status == 0) dic["StatusName"] = "处理中";
-                if (Status == 1) dic["StatusName"] = "成功";
-                if (Status == 2) dic["StatusName"] = "失败";
-
-                int QueryCount = int.Parse(dic["QueryCount"].ToString());
-                if (QueryCount == 0) dic["LockName"] = "待提交";
-                if (QueryCount == 1) dic["LockName"] = "已提交";
-            }
-            Dictionary<string, object> other = new Dictionary<string, object>();
-
-            string WaitAmount = "0.00";//待处理总金额
-            string SuccessAmount = "0.00";//提现成功总金额
-            string FailAmount = "0.00";//提现失败总金额
-            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(if(Status=0,TradeAmount,0)),SUM(if(Status=1,TradeAmount,0)),SUM(if(Status=2,TradeAmount,0)) FROM UserCashRecord where 1=1 " + condition);
-            if (dt.Rows.Count > 0)
-            {
-                WaitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-                SuccessAmount = decimal.Parse(function.CheckNum(dt.Rows[0][1].ToString())).ToString("f2");
-                FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][2].ToString())).ToString("f2");
-            }
-            other.Add("WaitAmount", WaitAmount);
-            other.Add("SuccessAmount", SuccessAmount);
-            other.Add("FailAmount", FailAmount);
-            obj.Add("other", other);
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 导出助利宝Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult HelpProfitExportExcel(UserCashRecord data, string MakerCode, string RealName, string StatusSelect, string PayStatus)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("CashOrderNo", "1"); //提现单号
-            Fields.Add("CreateDate", "3"); //创建时间
-
-            string condition = " and Status>-1 and TradeType=4";
-            //创客编号
-            if (!string.IsNullOrEmpty(MakerCode))
-            {
-                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + MakerCode + "')";
-            }
-            //创客名称
-            if (!string.IsNullOrEmpty(RealName))
-            {
-                condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
-            }
-            //提现状态
-            if (!string.IsNullOrEmpty(StatusSelect))
-            {
-                condition += " and Status=" + StatusSelect;
-            }
-            //提交到代付状态
-            if (!string.IsNullOrEmpty(PayStatus))
-            {
-                int QueryCount = int.Parse(function.CheckInt(PayStatus));
-                if (QueryCount == 2)
-                {
-                    QueryCount = 0;
-                }
-                condition += " and QueryCount=" + QueryCount;
-            }
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).IndexData("UserCashRecord", Fields, "Id desc", "0", 1, 20000, condition, "CashOrderNo,UserId,IdCardNo,ActualTradeAmount,Remark,Status,QueryCount,CreateDate", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-                int UserId = int.Parse(dic["UserId"].ToString());
-                var user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Models.Users();
-                dic["MakerCode"] = user.MakerCode;
-                dic["RealName"] = user.RealName;
-                dic["Mobile"] = user.Mobile;
-                dic["SettleBankName"] = user.SettleBankName;
-                dic["SettleBankCardNo"] = user.SettleBankCardNo;
-                dic.Remove("UserId");
-                // dic["TradeType"] = RelationClassForConst.GetTradeTypeInfo(int.Parse(dic["TradeType"].ToString()));
-                int Status = int.Parse(dic["Status"].ToString());
-                if (Status == 0) dic["StatusName"] = "处理中";
-                if (Status == 1) dic["StatusName"] = "成功";
-                if (Status == 2) dic["StatusName"] = "失败";
-                dic.Remove("Status");
-
-                int QueryCount = int.Parse(dic["QueryCount"].ToString());
-                if (QueryCount == 0) dic["LockName"] = "待提交";
-                if (QueryCount == 1) dic["LockName"] = "已提交";
-                dic.Remove("QueryCount");
-            }
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("CashOrderNo", "提现单号");
-            ReturnFields.Add("MakerCode", "创客编号");
-            ReturnFields.Add("RealName", "灵工姓名");
-            ReturnFields.Add("Mobile", "手机号");
-            ReturnFields.Add("IdCardNo", "身份证号");
-            ReturnFields.Add("SettleBankName", "开户行名称");
-            ReturnFields.Add("SettleBankCardNo", "开户行卡号");
-            ReturnFields.Add("ActualTradeAmount", "发佣金额(单位：元）");
-            ReturnFields.Add("LockName", "代付标记");
-            ReturnFields.Add("StatusName", "状态");
-            ReturnFields.Add("Remark", "备注");
-            ReturnFields.Add("CreateDate", "创建时间");
-
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "UserCashRecord", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-
-        #region 提交代付平台
-
-        /// <summary>
-        /// 提交代付平台
-        /// </summary>
-        /// <returns></returns>
-        public string Cash(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "UserCashRecord", "cash");
-            opdb.SaveChanges();
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                UserCashRecord edit = opdb.UserCashRecord.FirstOrDefault(m => m.Id == id && m.QueryCount == 0);
-                if (edit != null)
-                {
-                    edit.QueryCount = 1;
-                    edit.UpdateDate = DateTime.Now;
+                        CreateDate = DateTime.Now,
+                        UserId = edit.UserId, //创客
+                        ChangeType = 6, //变动类型
+                        ProductType = 99, //产品类型
+                        ChangeAmount = TradeAmount, //变更金额
+                        BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                        AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                        BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                        AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                        BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                        AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                    });
                     opdb.SaveChanges();
-                    RedisDbconn.Instance.AddList("CashPayApplyQueue", Newtonsoft.Json.JsonConvert.SerializeObject(edit));
                 }
+
+                opdb.SaveChanges();
             }
             return "success";
         }

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

@@ -133,6 +133,16 @@
                             </select>
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">是否运营仓</label>
+                        <div class="layui-input-inline">
+                            <select id="StoreKindSelect" name="StoreKindSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="0">否</option>
+                                <option value="1">是</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询

Areas/Admin/Views/OperateServer/StoreMachineApplyOperate/AuditSend.cshtml

@@ -36,8 +36,8 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">创客名称</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" readonly id="RealName" name="RealName"
-                                        value="@ViewBag.RealName" maxlength="32" lay-verify="required|"
+                                    <input class="layui-input" type="text" readonly id="MakerName" name="MakerName"
+                                        value="@ViewBag.MakerName" maxlength="32" lay-verify="required|"
                                         autocomplete="off" placeholder="">
                                 </div>
                             </div>

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

@@ -46,8 +46,8 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">创客名称</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" readonly id="RealName" name="RealName"
-                                        value="@ViewBag.RealName" maxlength="32" lay-verify="required|"
+                                    <input class="layui-input" type="text" readonly id="MakerName" name="MakerName"
+                                        value="@ViewBag.MakerName" maxlength="32" lay-verify="required|"
                                         autocomplete="off" placeholder="">
                                         <input class="layui-input" type="hidden" readonly id="UserId" name="UserId"
                                         value="@ViewBag.UserId" maxlength="32" lay-verify="required|"

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

@@ -48,21 +48,21 @@
                                     <label class="layui-form-label">创客编号</label>
                                     <div class="layui-input-inline">
                                         <input class="layui-input" type="text" id="MakerCode" name="MakerCode" value="@editData.MakerCode"
-                                            maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入创客编号">
+                                            maxlength="50" lay-verify="required|" readonly autocomplete="off" placeholder="请输入创客编号">
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">手机号</label>
                                     <div class="layui-input-inline">
                                         <input class="layui-input" type="text" id="MakerMobile" name="MakerMobile" value="@editData.MakerMobile"
-                                            maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入手机号">
+                                            maxlength="50" lay-verify="required|" readonly autocomplete="off" placeholder="请输入手机号">
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">初始额度</label>
                                     <div class="layui-input-inline">
                                         <input class="layui-input" type="text" readonly id="TotalAmt" name="TotalAmt" value="@editDatas.TotalAmt"
-                                            maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入初始额度">
+                                            maxlength="50" lay-verify="required|" readonly autocomplete="off" placeholder="请输入初始额度">
                                     </div>
                                 </div>
                                 <div class="layui-form-item">

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

@@ -76,7 +76,7 @@
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                    <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
+                    @* <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button> *@
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
@@ -96,7 +96,7 @@
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
+                    @* <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a> *@
                     }
                     @if (RightInfo.Contains("," + right + "_EditAmt,"))
                     {

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

@@ -1,147 +0,0 @@
-@{
-    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">
-    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <style>
-        .layui-input-inline {
-            width: 175px !important;
-        }
-
-        .layui-form-label {
-            width: 85px !important;
-        }
-
-        .layui-inline {
-            margin-right: 0px !important;
-        }
-
-        .w100 {
-            width: 100px !important;
-        }
-
-        .ml50 {
-            margin-left: 50px !important;
-        }
-    </style>
-</head>
-
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <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>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="CashOrderNo" autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">创客编号</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="MakerCode" autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">创客名称</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="RealName" autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">提现状态</label>
-                        <div class="layui-input-inline">
-                            <select id="StatusSelect" name="StatusSelect" lay-search="">
-                                <option value="">全部...</option>
-                                <option value="0">处理中</option>
-                                <option value="2">失败</option>
-                                <option value="1">成功</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">创建时间</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
-                                placeholder="创建时间" autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline ml50">
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
-                        </button>
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
-                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
-                        </button>
-                        @* @if (RightInfo.Contains("," + right + "_reduce,"))
-                        {
-                            <button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reduce"><i
-                                class="layui-icon layui-icon-edit"></i>驳回</button>
-                        } *@
-                        @if (RightInfo.Contains("," + right + "_export,"))
-                        {
-                            <button class="layui-btn" data-type="ExportExcel"><i
-                                class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
-                        }
-                        @if (RightInfo.Contains("," + right + "_import,"))
-                        {
-                            <button class="layui-btn" data-type="ImportData"><i
-                                class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>提现结果导入</button>
-                        }
-                        @if (RightInfo.Contains("," + right + "_cash,"))
-                        {
-                            <button class="layui-btn" data-type="Cash"><i
-                                class="layui-icon layui-icon-up layuiadmin-button-btn"></i>提交到代付平台</button>
-                        }
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-card-body">
-                <blockquote class="layui-elem-quote layui-text">
-                    待处理总金额(元)：<span style="color: #f00;" id="WaitAmount">0.00</span>　|　提现成功总金额(元)：<span
-                        style="color: #f00;" id="SuccessAmount">0.00</span>　|　提现失败总金额(元)：<span style="color: #f00;"
-                        id="FailAmount">0.00</span>
-                </blockquote>
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="StatusTpl">
-                    {{# if(d.Status == 2) { }}
-                    {{ d.StatusName }} <a href="javascript:;" style="color:cornflowerblue" onclick="layer.msg('{{ d.Remark }}')">点击查看原因</a>
-                    {{# } else { }}
-                    {{ d.StatusName }}
-                    {{# } }}
-                </script>
-                <script type="text/html" id="table-list-tools">
-                    {{# if(d.Status == 0) { }}
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reduce"><i class="layui-icon layui-icon-edit"></i>驳回</a>
-                    {{# } }}
-                    {{# if(d.QueryCount == 1 && d.Status == 2) { }}
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="cancel"><i class="layui-icon layui-icon-edit"></i>解冻</a>
-                    {{# } }}
-                </script>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/UserCashHelpRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
-    <script>
-
-    </script>
-</body>
-
-</html>

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

@@ -39,7 +39,7 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">模板下载</label>
                                 <div class="layui-form-mid layui-word-aux" id="excelTemp">
-                                    <a href="/users/提现结果模板.xlsx">点击下载入库模版</a>
+                                    <a href="/users/提现结果模板.xlsx">点击下载提现结果模版</a>
                                 </div>
                             </div>
                             <div class="layui-form-item">

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

@@ -78,16 +78,6 @@
                             </select>
                         </div>
                     </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">提交代付状态</label>
-                        <div class="layui-input-inline">
-                            <select id="QueryCountSelect" name="QueryCountSelect" lay-search="">
-                                <option value="">全部...</option>
-                                <option value="0">待提交</option>
-                                <option value="1">已提交</option>
-                            </select>
-                        </div>
-                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">创建时间</label>
                         <div class="layui-input-inline">
@@ -112,11 +102,11 @@
                             <button class="layui-btn" data-type="ExportExcel"><i
                                 class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
                         }
-                        @if (RightInfo.Contains("," + right + "_export,"))
+                        @* @if (RightInfo.Contains("," + right + "_export,"))
                         {
                             <button class="layui-btn" data-type="ImportData"><i
                                 class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>提现结果导入</button>
-                        }
+                        } *@
                         @* @if (RightInfo.Contains("," + right + "_cash,"))
                         {
                             <button class="layui-btn" data-type="Cash"><i

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

@@ -1,142 +0,0 @@
-@{
-    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">
-    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <style>
-        .layui-input-inline {
-            width: 175px !important;
-        }
-
-        .layui-form-label {
-            width: 85px !important;
-        }
-
-        .layui-inline {
-            margin-right: 0px !important;
-        }
-
-        .w100 {
-            width: 100px !important;
-        }
-
-        .ml50 {
-            margin-left: 50px !important;
-        }
-    </style>
-</head>
-
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <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>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="CashOrderNo" autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">创客编号</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="MakerCode" autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">创客名称</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="RealName" autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">提现状态</label>
-                        <div class="layui-input-inline">
-                            <select id="StatusSelect" name="StatusSelect" lay-search="">
-                                <option value="">全部...</option>
-                                <option value="0">处理中</option>
-                                <option value="2">失败</option>
-                                <option value="1">成功</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">创建时间</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
-                                placeholder="创建时间" autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline ml50">
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
-                        </button>
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
-                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
-                        </button>
-                        @* @if (RightInfo.Contains("," + right + "_reduce,"))
-                        {
-                            <button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reduce"><i
-                                class="layui-icon layui-icon-edit"></i>驳回</button>
-                        } *@
-                        @if (RightInfo.Contains("," + right + "_export,"))
-                        {
-                            <button class="layui-btn" data-type="ExportExcel"><i
-                                class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
-                        }
-                        @if (RightInfo.Contains("," + right + "_import,"))
-                        {
-                            <button class="layui-btn" data-type="ImportData"><i
-                                class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>提现结果导入</button>
-                        }
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-card-body">
-                <blockquote class="layui-elem-quote layui-text">
-                    待处理总金额(元)：<span style="color: #f00;" id="WaitAmount">0.00</span>　|　提现成功总金额(元)：<span
-                        style="color: #f00;" id="SuccessAmount">0.00</span>　|　提现失败总金额(元)：<span style="color: #f00;"
-                        id="FailAmount">0.00</span>
-                </blockquote>
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="StatusTpl">
-                    {{# if(d.Status == 2) { }}
-                    {{ d.StatusName }} <a href="javascript:;" style="color:cornflowerblue" onclick="layer.msg('{{ d.Remark }}')">点击查看原因</a>
-                    {{# } else { }}
-                    {{ d.StatusName }}
-                    {{# } }}
-                </script>
-                <script type="text/html" id="table-list-tools">
-                    {{# if(d.Status == 0) { }}
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reduce"><i class="layui-icon layui-icon-edit"></i>驳回</a>
-                    {{# } }}
-                    {{# if(d.QueryCount == 1 && d.Status == 2) { }}
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="cancel"><i class="layui-icon layui-icon-edit"></i>解冻</a>
-                    {{# } }}
-                </script>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/UserCashLeaderRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
-    <script>
-
-    </script>
-</body>
-
-</html>

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

@@ -1,4 +1,4 @@
-@using MySystem.Models;
+@using MySystem.OpModels;
 @{UserCashRecord editData = ViewBag.data as UserCashRecord;}
 @{
     string RightInfo = ViewBag.RightInfo as string;

Models/Orders.cs

@@ -64,5 +64,6 @@ namespace MySystem.Models
         public string OrderNo { get; set; }
         public int UserId { get; set; }
         public int ParentOrderId { get; set; }
+        public int OpId { get; set; }
     }
 }

Models/PosCouponRecord.cs

@@ -19,5 +19,6 @@ namespace MySystem.Models
         public int ToUserId { get; set; }
         public int FromUserId { get; set; }
         public int PosCouponId { get; set; }
+        public int OpId { get; set; }
     }
 }

Models/Users.cs

@@ -88,5 +88,11 @@ namespace MySystem.Models
         public string DeviceType { get; set; }
         public DateTime? HelpProfitAgreeDate { get; set; }
         public ulong HelpProfitAgree { get; set; }
+        public int ThisMonthSend { get; set; }
+        public int StoreStock { get; set; }
+        public DateTime? CreateStoreDate { get; set; }
+        public ulong IsSign { get; set; }
+        public DateTime? SignDate { get; set; }
+        public string SignPic { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -7836,6 +7836,8 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.OpId).HasColumnType("int(11)");
+
                 entity.Property(e => e.OrderNo)
                     .HasColumnType("varchar(30)")
                     .HasCharSet("utf8")
@@ -8257,6 +8259,8 @@ namespace MySystem.Models
 
                 entity.Property(e => e.FromUserId).HasColumnType("int(11)");
 
+                entity.Property(e => e.OpId).HasColumnType("int(11)");
+
                 entity.Property(e => e.OrderNo)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -17753,6 +17757,8 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.CreateStoreDate).HasColumnType("datetime");
+
                 entity.Property(e => e.DeviceId)
                     .HasColumnType("varchar(128)")
                     .HasCharSet("utf8")
@@ -17805,6 +17811,10 @@ namespace MySystem.Models
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");
 
+                entity.Property(e => e.IsSign)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
+
                 entity.Property(e => e.LeaderLevel).HasColumnType("int(11)");
 
                 entity.Property(e => e.LockStatus)
@@ -17933,20 +17943,31 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Sex).HasColumnType("int(11)");
 
+                entity.Property(e => e.SignDate).HasColumnType("datetime");
+
                 entity.Property(e => e.SignImgUrl)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.SignPic)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.Sort).HasColumnType("int(11)");
 
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
+                entity.Property(e => e.StoreStock).HasColumnType("int(11)");
+
                 entity.Property(e => e.Tags)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.ThisMonthSend).HasColumnType("int(11)");
+
                 entity.Property(e => e.ThisMonthTrade).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");

wwwroot/layuiadmin/modules_main/StoreHouse_Admin.js

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

wwwroot/layuiadmin/modules_main/StoreMachineApply_Admin.js

@@ -382,12 +382,6 @@ var active = {
                         }
                     });
                 }, 300);
-
-
-
-
-
-
                 //监听提交
                 iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
                     var field = data.field; //获取提交的字段

wwwroot/layuiadmin/modules_operate/StoreMachineApplys_Admin.js

@@ -383,12 +383,6 @@ var active = {
                         }
                     });
                 }, 300);
-
-
-
-
-
-
                 //监听提交
                 iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
                     var field = data.field; //获取提交的字段

wwwroot/layuiadmin/modules_operate/UserCashRecord_Admin.js

@@ -175,11 +175,6 @@ layui.config({
                     title: '订单状态',
                     templet: '#StatusTpl',
                     sort: true
-                }, {
-                    field: 'LockName',
-                    width: 200,
-                    title: '提现标记',
-                    sort: true
                 }, {
                     field: 'ReturnCode',
                     width: 200,
@@ -337,12 +332,6 @@ layui.config({
                             }
                         });
                     }, 300);
-
-
-
-
-
-
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
                         var field = data.field; //获取提交的字段