调整

Areas/Admin/Controllers/BsServer/BaseController.cs

@@ -41,6 +41,8 @@ namespace MySystem.Areas.Admin.Controllers
         public string JwtIss = Library.ConfigurationManager.AppSettings["JwtIss"].ToString();
         public string JwtAud = Library.ConfigurationManager.AppSettings["JwtAud"].ToString();
         
+        public string OpConn = Library.ConfigurationManager.AppSettings["OpSqlConnStr"].ToString();
+        
         public int SysId;
         public int SysRealRole;
         public string SysUserName = "";

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -165,7 +165,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string[] datelist = SendDateData.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'";
+                condition += " and SendDate>='" + start + " 00:00:00' and SendDate<='" + end + " 23:59:59'";
             }
 
             //退款状态
@@ -1046,15 +1046,15 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportsExcel(Orders data, string UserIdMakerCode, string UserIdRealName, string PayModeSelect, string StoreIdStoreNo, string StoreIdStoreName, string RefundStatusSelect, string DeliveryTypeSelect, string SendStatusSelect, string ProductIdSelect, string StoreTypeSelect, string StoreUserIdMakerCode, string StoreUserIdRealName, string PayStatusSelect, string PayDateData, string RedisKey = "ExportKey")
+        public JsonResult ExportsExcel(Orders data, string UserIdMakerCode, string UserIdRealName, string PayModeSelect, string StoreIdStoreNo, string StoreIdStoreName, string RefundStatusSelect, string DeliveryTypeSelect, string SendStatusSelect, string ProductIdSelect, string StoreTypeSelect, string StoreUserIdMakerCode, string StoreUserIdRealName, string PayStatusSelect, string CreateDateData, string SendDateData, string PayDateData, string RedisKey = "ExportKey")
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("CreateDate", "3"); //时间
+            // Fields.Add("CreateDate", "3"); //时间
             Fields.Add("OrderNo", "1"); //订单号
             Fields.Add("RealName", "1"); //姓名
             Fields.Add("Mobile", "1"); //手机号
             Fields.Add("ErpCode", "1"); //运单号
-            Fields.Add("SendDate", "3"); //发货时间
+            // Fields.Add("SendDate", "3"); //发货时间
             Fields.Add("TradeNo", "1"); //支付交易号
             Fields.Add("StoreContact", "1"); //仓库联系人
             Fields.Add("SnNos", "2"); //SN编号
@@ -1134,6 +1134,22 @@ namespace MySystem.Areas.Admin.Controllers
                 string end = datelist[1];
                 condition += " and PayDate>='" + start + " 00:00:00' and PayDate<='" + end + " 23:59:59'";
             }
+            //下单时间
+            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(SendDateData))
+            {
+                string[] datelist = SendDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and SendDate>='" + start + " 00:00:00' and SendDate<='" + end + " 23:59:59'";
+            }
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Orders", Fields, "Id desc", "0", 1, 20000, condition, "UserId,OrderNo,RealName,Mobile,TotalPrice,Areas,Address,ErpName,ErpCode,SendDate,PayMode,PayDate,TradeNo,StoreId,RefundStatus,DeliveryType,SendStatus,ProductId,StoreContact,StoreType,StoreUserId,TopUserId,PayStatus,BuyCount,Remark,Id", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -1555,7 +1555,7 @@ namespace MySystem.Areas.Admin.Controllers
         public IActionResult BatchSetting(string right, string StoreIds)
         {
             string[] idlist = StoreIds.Split(new char[] { ',' });
-            var totalAmount = 0;
+            decimal totalAmount = 0;
             decimal deposit = 0;
             var userIds = "";
             foreach (var item in idlist)
@@ -1585,7 +1585,9 @@ namespace MySystem.Areas.Admin.Controllers
             }
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            ViewBag.totalAmount = "关联分仓机具需要额度：" + totalAmount + "\n" + "关联分仓获得押金：" + deposit;
+            // ViewBag.totalAmount = "关联分仓机具需要额度：" + totalAmount + "\n" + "关联分仓获得押金：" + deposit;
+            ViewBag.totalAmount = "关联分仓机具需要额度：" + totalAmount;
+            ViewBag.deposit = "关联分仓获得押金：" + deposit;
 
             return View();
         }
@@ -1681,7 +1683,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 {
                                     foreach (var items in pos)
                                     {
-                                        var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == items.Id) ?? new PosMachinesTwo();
+                                        var posInfo = pos.FirstOrDefault(m => m.Id == items.Id) ?? new PosMachinesTwo();
                                         posInfo.OpId = sysAdmin.UserId;
                                         if (userAmount.ValidAmount - amount >= 0)
                                         {
@@ -1852,7 +1854,8 @@ namespace MySystem.Areas.Admin.Controllers
             }
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            ViewBag.totalAmount = "取消关联机具获得额度：" + totalAmount + "\n" + "取消关联分仓扣除押金：" + deposit;
+            ViewBag.totalAmount = "取消关联机具获得额度：" + totalAmount;
+            ViewBag.deposit = "取消关联分仓扣除押金：" + deposit;
             return View();
         }
 
@@ -1915,7 +1918,7 @@ namespace MySystem.Areas.Admin.Controllers
                             }
                             foreach (var items in pos)
                             {
-                                var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == items.Id) ?? new PosMachinesTwo();
+                                var posInfo = pos.FirstOrDefault(m => m.Id == items.Id) ?? new PosMachinesTwo();
                                 userAmount.ValidAmount += posInfo.OpReserve3;
                                 userAmount.TotalAmt += posInfo.OpReserve1;
                                 userAmount.ValidForGetAmount += posInfo.OpReserve2;

Areas/Admin/Controllers/OperateServer/StoreHouseOperateController.cs

@@ -113,25 +113,26 @@ namespace MySystem.Areas.Admin.Controllers
                 int Id = int.Parse(function.CheckInt(dic["Id"].ToString()));
                 int PreCount = db.PreSendStockDetail.Count(m => m.FromStoreId == Id && m.ApplyFlag == 0 && m.Status >= 0 && m.Status <= 1);
                 dic["PreNum"] = PreCount.ToString();
-                //分仓额度
-                var amount = db.UserAccount.FirstOrDefault(m => m.Id == UserId) ?? new UserAccount();
-                var ValidAmount = amount.ValidAmount;
-                var FixedAmount = amount.FixedAmount;
-                var TempAmount = amount.TempAmount + amount.TempAmountForBalance;
-                var check = db.StoreHouseAmountPromiss.Any(m => m.ToUserId == UserId);
-                decimal PromissAmount = 0;
-                var ThisMonthPreAmount = amount.ThisMonthPreAmount;
-                var ValidPreAmount = amount.ValidPreAmount;
-                if (check)
-                {
-                    PromissAmount = db.StoreHouseAmountPromiss.Where(m => m.Status == 1 && m.ToUserId == UserId).Sum(m => m.PromissAmount);
-                }
-                dic["ValidAmount"] = ValidAmount.ToString();//可用额度
-                dic["FixedAmount"] = FixedAmount.ToString();//固定额度
-                dic["TempAmount"] = TempAmount.ToString();//临时额度
-                dic["PromissAmount"] = PromissAmount.ToString();//担保金额
-                dic["ThisMonthPreAmount"] = ThisMonthPreAmount.ToString();//本月小分仓额度
-                dic["ValidPreAmount"] = ValidPreAmount.ToString();//可用小分仓额度
+                
+                // //分仓额度
+                // var amount = db.UserAccount.FirstOrDefault(m => m.Id == UserId) ?? new UserAccount();
+                // var ValidAmount = amount.ValidAmount;
+                // var FixedAmount = amount.FixedAmount;
+                // var TempAmount = amount.TempAmount + amount.TempAmountForBalance;
+                // var check = db.StoreHouseAmountPromiss.Any(m => m.ToUserId == UserId);
+                // decimal PromissAmount = 0;
+                // var ThisMonthPreAmount = amount.ThisMonthPreAmount;
+                // var ValidPreAmount = amount.ValidPreAmount;
+                // if (check)
+                // {
+                //     PromissAmount = db.StoreHouseAmountPromiss.Where(m => m.Status == 1 && m.ToUserId == UserId).Sum(m => m.PromissAmount);
+                // }
+                // dic["ValidAmount"] = ValidAmount.ToString();//可用额度
+                // dic["FixedAmount"] = FixedAmount.ToString();//固定额度
+                // dic["TempAmount"] = TempAmount.ToString();//临时额度
+                // dic["PromissAmount"] = PromissAmount.ToString();//担保金额
+                // dic["ThisMonthPreAmount"] = ThisMonthPreAmount.ToString();//本月小分仓额度
+                // dic["ValidPreAmount"] = ValidPreAmount.ToString();//可用小分仓额度
             }
             return Json(obj);
         }

Areas/Admin/Controllers/OperateServer/StoreMachineApplyOperateController.cs

@@ -25,7 +25,6 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public StoreMachineApplyOperateController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["OpSqlConnStr"].ToString();
         }
 
         #region 运营中心机具申请记录列表
@@ -85,7 +84,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).IndexData("StoreMachineApply", Fields, "Id desc", "0", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).IndexData("StoreMachineApply", 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)
             {
@@ -167,7 +166,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).IndexData("StoreMachineApply", Fields, "Id desc", "0", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).IndexData("StoreMachineApply", 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)
             {
@@ -234,7 +233,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Add("StoreMachineApply", Fields, 0);
+            int Id = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Add("StoreMachineApply", Fields, 0);
             AddSysLog(data.Id.ToString(), "StoreMachineApply", "add");
             opdb.SaveChanges();
 
@@ -319,7 +318,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", SysUserName + '-' + SysRealName);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("StoreMachineApply", Fields, data.Id);
+            new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("StoreMachineApply", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "OpStoreMachineApply", "update");
             db.SaveChanges();
 
@@ -343,7 +342,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("StoreMachineApply", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("StoreMachineApply", Fields, id);
             }
             db.SaveChanges();
 
@@ -367,7 +366,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("StoreMachineApply", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("StoreMachineApply", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -416,7 +415,7 @@ namespace MySystem.Areas.Admin.Controllers
                     users.ValidForGetAmount += ValidForGetAmount;
                     opdb.SaveChanges();
                 }
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("StoreMachineApply", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("StoreMachineApply", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -431,7 +430,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Sort("StoreMachineApply", Sort, Id);
+            new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Sort("StoreMachineApply", Sort, Id);
 
             AddSysLog(Id.ToString(), "StoreMachineApply", "sort");
             return "success";
@@ -496,7 +495,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).IndexData("StoreMachineApply", Fields, "Id desc", "0", 1, 20000, condition, "BrandId,ApplyNo,ApplyNum,SendNum,UseAmount,SendMode,ErpCode,UserId", false);
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).IndexData("StoreMachineApply", Fields, "Id desc", "0", 1, 20000, condition, "BrandId,ApplyNo,ApplyNum,SendNum,UseAmount,SendMode,ErpCode,UserId", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -982,7 +981,7 @@ namespace MySystem.Areas.Admin.Controllers
             apply.UseAmount = ApplyAmount;
 
             db.SaveChanges();
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("StoreMachineApply", Fields, data.Id);
+            new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("StoreMachineApply", Fields, data.Id);
 
             string SendData = "{\"Kind\":\"2\",\"Data\":{\"UserId\":\"" + apply.UserId + "\",\"Amount\":\"" + Amount + "\",\"OperateType\":\"1\"}}";
             RedisDbconn.Instance.AddList("StoreApplyQueue", SendData);

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -25,7 +25,6 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public SysAdminOperateController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["OpSqlConnStr"].ToString();
         }
 
         #region 运营中心列表
@@ -89,7 +88,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).IndexData("SysAdmin", Fields, "Id desc", "0", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).IndexData("SysAdmin", 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)
             {
@@ -184,7 +183,7 @@ namespace MySystem.Areas.Admin.Controllers
                     Fields.Add("FilePath", data.FilePath); //附件
                     Fields.Add("QueryCount", 1); //是否为主账号(1是，0否)
 
-                    int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Add("SysAdmin", Fields, 0);
+                    int Id = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Add("SysAdmin", Fields, 0);
                     SysAdmin edit = opdb.SysAdmin.FirstOrDefault(m => m.Id == Id);
                     if (edit != null)
                     {
@@ -214,7 +213,7 @@ namespace MySystem.Areas.Admin.Controllers
                         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);
+                        int Ids = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Add("UserAccount", Field, 0);
                         AddSysLog(userAccount.Id.ToString(), "UserAccount", "add");
                         var query = opdb.SysAdminRole.Add(new SysAdminRole()
                         {
@@ -328,7 +327,7 @@ namespace MySystem.Areas.Admin.Controllers
                     Fields.Add("Password", function.MD5_32(data.Password)); //密码
                 }
             }
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("SysAdmin", Fields, data.Id);
+            new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).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");
@@ -363,7 +362,7 @@ namespace MySystem.Areas.Admin.Controllers
                     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);
+                        new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).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();
@@ -422,7 +421,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("SysAdmin", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("SysAdmin", Fields, id);
             }
             opdb.SaveChanges();
 
@@ -446,7 +445,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("SysAdmin", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("SysAdmin", Fields, id);
             }
             opdb.SaveChanges();
             return "success";
@@ -469,7 +468,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("SysAdmin", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("SysAdmin", Fields, id);
             }
             opdb.SaveChanges();
             return "success";
@@ -484,7 +483,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Sort("SysAdmin", Sort, Id);
+            new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Sort("SysAdmin", Sort, Id);
 
             AddSysLog(Id.ToString(), "SysAdmin", "sort");
             return "success";
@@ -531,7 +530,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("Role", "1"); //角色
             Fields.Add("LastLoginDate", "3"); //最后登录时间
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).IndexData("SysAdmin", Fields, "Id desc", "0", 1, 20000, "", "", false);
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).IndexData("SysAdmin", Fields, "Id desc", "0", 1, 20000, "", "", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {

Areas/Admin/Controllers/OperateServer/SysAdminRoleOperateController.cs

@@ -25,7 +25,6 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public SysAdminRoleOperateController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["OpSqlConnStr"].ToString();
         }
 
         #region 运营中心角色列表
@@ -67,7 +66,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             Fields.Add("Name", "2"); //名称
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).IndexData("SysAdminRole", Fields, "Id desc", "0", page, limit, " and Status>-1");
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).IndexData("SysAdminRole", Fields, "Id desc", "0", page, limit, " and Status>-1");
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -112,7 +111,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Add("SysAdminRole", Fields, 0);
+            int Id = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Add("SysAdminRole", Fields, 0);
             AddSysLog(data.Id.ToString(), "SysAdminRole", "add");
             opdb.SaveChanges();
 
@@ -158,7 +157,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("SysAdminRole", Fields, data.Id);
+            new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("SysAdminRole", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "SysAdminRole", "update");
             opdb.SaveChanges();
 
@@ -182,7 +181,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("SysAdminRole", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("SysAdminRole", Fields, id);
             }
             opdb.SaveChanges();
 
@@ -206,7 +205,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("SysAdminRole", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("SysAdminRole", Fields, id);
             }
             opdb.SaveChanges();
             return "success";
@@ -229,7 +228,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("SysAdminRole", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("SysAdminRole", Fields, id);
             }
             opdb.SaveChanges();
             return "success";
@@ -244,7 +243,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Sort("SysAdminRole", Sort, Id);
+            new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Sort("SysAdminRole", Sort, Id);
 
             AddSysLog(Id.ToString(), "SysAdminRole", "sort");
             return "success";
@@ -288,7 +287,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("Name", "2"); //名称
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).IndexData("SysAdminRole", Fields, "Id desc", "0", 1, 20000, "", "", false);
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).IndexData("SysAdminRole", Fields, "Id desc", "0", 1, 20000, "", "", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {

Areas/Admin/Controllers/OperateServer/SystemSetOperateController.cs

@@ -25,7 +25,6 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public SystemSetOperateController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["OpSqlConnStr"].ToString();
         }
 
         #region 运营中心系统设置列表
@@ -67,7 +66,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("WebUrl", "2"); //网站地址
             Fields.Add("WebName", "2"); //网站名称
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).IndexData("SystemSet", Fields, "Id desc", "False", page, limit);
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).IndexData("SystemSet", Fields, "Id desc", "False", page, limit);
             //List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             //foreach (Dictionary<string, object> dic in diclist)
             //{
@@ -121,7 +120,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("WebStatCode", data.WebStatCode); //网站统计代码
             Fields.Add("Logo", data.Logo); //Logo图片
 
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Add("SystemSet", Fields, 0);
+            int Id = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Add("SystemSet", Fields, 0);
             AddSysLog(data.Id.ToString(), "SystemSet", "add");
             opdb.SaveChanges();
 
@@ -181,11 +180,11 @@ namespace MySystem.Areas.Admin.Controllers
             SystemSet check = opdb.SystemSet.FirstOrDefault();
             if (check == null)
             {
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Add("SystemSet", Fields, 0);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Add("SystemSet", Fields, 0);
             }
             else
             {
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("SystemSet", Fields, data.Id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("SystemSet", Fields, data.Id);
             }
             AddSysLog(data.Id.ToString(), "SystemSet", "update");
             opdb.SaveChanges();
@@ -205,11 +204,11 @@ namespace MySystem.Areas.Admin.Controllers
             SystemSet check = opdb.SystemSet.FirstOrDefault();
             if (check == null)
             {
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Add("SystemSet", Fields, 0);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Add("SystemSet", Fields, 0);
             }
             else
             {
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("SystemSet", Fields, data.Id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("SystemSet", Fields, data.Id);
             }
             AddSysLog(data.Id.ToString(), "SystemSet", "AppStart");
 
@@ -257,7 +256,7 @@ namespace MySystem.Areas.Admin.Controllers
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Delete("SystemSet", id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Delete("SystemSet", id);
             }
             opdb.SaveChanges();
 
@@ -281,7 +280,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("SystemSet", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("SystemSet", Fields, id);
             }
             opdb.SaveChanges();
             return "success";
@@ -304,7 +303,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("SystemSet", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("SystemSet", Fields, id);
             }
             opdb.SaveChanges();
             return "success";
@@ -319,7 +318,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Sort("SystemSet", Sort, Id);
+            new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Sort("SystemSet", Sort, Id);
 
             AddSysLog(Id.ToString(), "SystemSet", "sort");
             return "success";
@@ -364,7 +363,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("WebUrl", "2"); //网站地址
             Fields.Add("WebName", "2"); //网站名称
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).IndexData("SystemSet", Fields, "Id desc", "False", 1, 20000, "", "", false);
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).IndexData("SystemSet", Fields, "Id desc", "False", 1, 20000, "", "", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
 
             Dictionary<string, object> result = new Dictionary<string, object>();

Areas/Admin/Controllers/OperateServer/UserAccountRecordOperateController.cs

@@ -26,7 +26,6 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public UserAccountRecordOperateController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["OpSqlConnStr"].ToString();
         }
 
         #region 创客账户变动记录列表
@@ -134,7 +133,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and TransRecordNo='" + data.TransRecordNo + "'";
             }
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserAccountRecord", Fields, "Id desc", "0", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).IndexData("UserAccountRecord", 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)
             {
@@ -229,7 +228,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("UserAccountRecord", Fields, 0);
+            int Id = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Add("UserAccountRecord", Fields, 0);
             AddSysLog(data.Id.ToString(), "UserAccountRecord", "add");
             db.SaveChanges();
 
@@ -272,7 +271,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("UserAccountRecord", Fields, data.Id);
+            new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("UserAccountRecord", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "UserAccountRecord", "update");
             db.SaveChanges();
 
@@ -296,7 +295,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("UserAccountRecord", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("UserAccountRecord", Fields, id);
             }
             db.SaveChanges();
 
@@ -320,7 +319,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("UserAccountRecord", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("UserAccountRecord", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -343,7 +342,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("UserAccountRecord", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("UserAccountRecord", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -358,7 +357,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("UserAccountRecord", Sort, Id);
+            new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Sort("UserAccountRecord", Sort, Id);
 
             AddSysLog(Id.ToString(), "UserAccountRecord", "sort");
             return "success";
@@ -431,7 +430,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId=" + UserId;
             }
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserAccountRecord", Fields, "Id desc", "0", 1, 20000, condition, "UserId,ProductType,TransRecordNo,ChangeType,ChangeAmount,Remark,BeforeTotalAmount,AfterTotalAmount,BeforeFreezeAmount,AfterFreezeAmount,BeforeBalanceAmount,AfterBalanceAmount,CreateDate", false);
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).IndexData("UserAccountRecord", Fields, "Id desc", "0", 1, 20000, condition, "UserId,ProductType,TransRecordNo,ChangeType,ChangeAmount,Remark,BeforeTotalAmount,AfterTotalAmount,BeforeFreezeAmount,AfterFreezeAmount,BeforeBalanceAmount,AfterBalanceAmount,CreateDate", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {

Areas/Admin/Controllers/OperateServer/UserCashRecordOperateController.cs

@@ -26,7 +26,6 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public UserCashRecordOperateController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["OpSqlConnStr"].ToString();
         }
 
         #region 提现记录列表
@@ -134,7 +133,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
             }
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).IndexData("UserCashRecord", Fields, "Id desc", "0", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).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)
             {
@@ -207,7 +206,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Add("UserCashRecord", Fields, 0);
+            int Id = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Add("UserCashRecord", Fields, 0);
             AddSysLog(data.Id.ToString(), "UserCashRecord", "add");
             db.SaveChanges();
 
@@ -250,7 +249,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("UserCashRecord", Fields, data.Id);
+            new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("UserCashRecord", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "UserCashRecord", "update");
             opdb.SaveChanges();
 
@@ -274,7 +273,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("UserCashRecord", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("UserCashRecord", Fields, id);
             }
             opdb.SaveChanges();
 
@@ -298,7 +297,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("UserCashRecord", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("UserCashRecord", Fields, id);
             }
             opdb.SaveChanges();
             return "success";
@@ -321,7 +320,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("UserCashRecord", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("UserCashRecord", Fields, id);
             }
             opdb.SaveChanges();
             return "success";
@@ -345,7 +344,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);//设置提现记录为成功
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("UserCashRecord", Fields, id);                
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("UserCashRecord", Fields, id);                
             }
             opdb.SaveChanges();
             return "success";
@@ -360,7 +359,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Sort("UserCashRecord", Sort, Id);
+            new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Sort("UserCashRecord", Sort, Id);
 
             AddSysLog(Id.ToString(), "UserCashRecord", "sort");
             return "success";
@@ -441,7 +440,7 @@ namespace MySystem.Areas.Admin.Controllers
                 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);
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).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)
             {

Areas/Admin/Controllers/OperateServer/UserCashRecordOperatesController.cs

@@ -26,7 +26,6 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public UserCashRecordOperatesController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["OpSqlConnStr"].ToString();
         }
 
         #region 提现记录列表
@@ -134,7 +133,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
             }
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).IndexData("UserCashRecord", Fields, "Id desc", "0", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).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)
             {
@@ -207,7 +206,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Add("UserCashRecord", Fields, 0);
+            int Id = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Add("UserCashRecord", Fields, 0);
             AddSysLog(data.Id.ToString(), "UserCashRecord", "add");
             db.SaveChanges();
 
@@ -250,7 +249,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("UserCashRecord", Fields, data.Id);
+            new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("UserCashRecord", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "UserCashRecord", "update");
             opdb.SaveChanges();
 
@@ -274,7 +273,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("UserCashRecord", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("UserCashRecord", Fields, id);
             }
             opdb.SaveChanges();
 
@@ -298,7 +297,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("UserCashRecord", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("UserCashRecord", Fields, id);
             }
             opdb.SaveChanges();
             return "success";
@@ -321,7 +320,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("UserCashRecord", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("UserCashRecord", Fields, id);
             }
             opdb.SaveChanges();
             return "success";
@@ -345,7 +344,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);//设置提现记录为成功
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("UserCashRecord", Fields, id);
+                new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Edit("UserCashRecord", Fields, id);
                 var userCashRecord = opdb.UserCashRecord.FirstOrDefault(m => m.Id == id) ?? new UserCashRecord();
                 if (userCashRecord.Id > 0)
                 {
@@ -420,7 +419,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Sort("UserCashRecord", Sort, Id);
+            new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).Sort("UserCashRecord", Sort, Id);
 
             AddSysLog(Id.ToString(), "UserCashRecord", "sort");
             return "success";
@@ -501,7 +500,7 @@ namespace MySystem.Areas.Admin.Controllers
                 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);
+            Dictionary<string, object> obj = new AdminContentByConn(_accessor.HttpContext, PublicFunction.OpTables, OpConn).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)
             {

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

@@ -2,6 +2,7 @@
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
     string totalAmount = ViewBag.totalAmount as string;
+    string deposit = ViewBag.deposit as string;
 }
 <!DOCTYPE html>
 <html>
@@ -41,6 +42,9 @@
                                         <div class="layui-input-inline">
                                             @ViewBag.totalAmount
                                         </div>
+                                        <div class="layui-input-inline">
+                                            @ViewBag.deposit
+                                        </div>
                                     </div>
                                 </div>
                             </div>

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

@@ -2,6 +2,7 @@
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
     string totalAmount = ViewBag.totalAmount as string;
+    string deposit = ViewBag.deposit as string;
 
 }
 <!DOCTYPE html>
@@ -42,6 +43,9 @@
                                         <div class="layui-input-inline">
                                             @ViewBag.totalAmount
                                         </div>
+                                        <div class="layui-input-inline">
+                                            @ViewBag.deposit
+                                        </div>
                                     </div>
                                 </div>
                                 @* <div class="layui-form-item">

wwwroot/layuiadmin/modules_main/Orders_Admin.js

@@ -572,6 +572,8 @@ layui.config({
         },ExportsExcel: function () {
             var userdata = '';
             $(".layuiadmin-card-header-auto input").each(function (i) {
+                console.log($(this).attr('name'));
+                console.log($(this).val());
                 userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
             });
             $(".layuiadmin-card-header-auto select").each(function (i) {

wwwroot/layuiadmin/modules_operate/StoreHouse_Admin.js

@@ -229,42 +229,43 @@ layui.config({
                 width: 150,
                 title: '创建时间',
                 sort: true
-            }, {
-                field: 'Deposit',
-                width: 110,
-                title: '押金',
-                sort: true
-            }, {
-                field: 'ValidAmount',
-                width: 110,
-                title: '可用额度',
-                sort: true
-            }, {
-                field: 'FixedAmount',
-                width: 110,
-                title: '固定额度',
-                sort: true
-            }, {
-                field: 'TempAmount',
-                width: 110,
-                title: '临时额度',
-                sort: true
-            }, {
-                field: 'PromissAmount',
-                width: 110,
-                title: '担保额度',
-                sort: true
-            }, {
-                field: 'ThisMonthPreAmount',
-                width: 150,
-                title: '本月小分仓额度',
-                sort: true
-            }, {
-                field: 'ValidPreAmount',
-                width: 150,
-                title: '可用小分仓额度',
-                sort: true
             }
+            // , {
+            //     field: 'Deposit',
+            //     width: 110,
+            //     title: '押金',
+            //     sort: true
+            // }, {
+            //     field: 'ValidAmount',
+            //     width: 110,
+            //     title: '可用额度',
+            //     sort: true
+            // }, {
+            //     field: 'FixedAmount',
+            //     width: 110,
+            //     title: '固定额度',
+            //     sort: true
+            // }, {
+            //     field: 'TempAmount',
+            //     width: 110,
+            //     title: '临时额度',
+            //     sort: true
+            // }, {
+            //     field: 'PromissAmount',
+            //     width: 110,
+            //     title: '担保额度',
+            //     sort: true
+            // }, {
+            //     field: 'ThisMonthPreAmount',
+            //     width: 150,
+            //     title: '本月小分仓额度',
+            //     sort: true
+            // }, {
+            //     field: 'ValidPreAmount',
+            //     width: 150,
+            //     title: '可用小分仓额度',
+            //     sort: true
+            // }
             ]
         ],
         where: {