修复助利宝代码，运行正常

Areas/Admin/Controllers/MainServer/HelpProfitAccountRecordController.cs

@@ -25,6 +25,7 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public HelpProfitAccountRecordController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
+            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
         }
 
         #region 助利宝账户变动记录列表
@@ -37,8 +38,8 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
-            
+
+
             return View();
         }
 
@@ -52,54 +53,54 @@ namespace MySystem.Areas.Admin.Controllers
         /// <returns></returns>
         public JsonResult IndexData(HelpProfitAccountRecord data, string ChangeTypeSelect, string ProductTypeSelect, int page = 1, int limit = 30)
         {
-            
+
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            
+
             Fields.Add("CreateDate", "3"); //时间
-Fields.Add("TransRecordNo", "1"); //交易流水编号
+            Fields.Add("TransRecordNo", "1"); //交易流水编号
 
 
             string condition = " and Status>-1";
             //变动类型
-if (!string.IsNullOrEmpty(ChangeTypeSelect))
-{
-condition += " and ChangeType=" + ChangeTypeSelect;
-}
-//产品类型
-if (!string.IsNullOrEmpty(ProductTypeSelect))
-{
-condition += " and ProductType=" + ProductTypeSelect;
-}
+            if (!string.IsNullOrEmpty(ChangeTypeSelect))
+            {
+                condition += " and ChangeType=" + ChangeTypeSelect;
+            }
+            //产品类型
+            if (!string.IsNullOrEmpty(ProductTypeSelect))
+            {
+                condition += " and ProductType=" + ProductTypeSelect;
+            }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("HelpProfitAccountRecord", Fields, "Id desc", "0", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("HelpProfitAccountRecord", 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 ChangeType = int.Parse(dic["ChangeType"].ToString());
-if(ChangeType == 0) dic["ChangeType"] = " 激活奖励";
-if(ChangeType == 1) dic["ChangeType"] = " 交易分润";
-if(ChangeType == 2) dic["ChangeType"] = " 提现申请";
-if(ChangeType == 3) dic["ChangeType"] = " 提现代付";
-if(ChangeType == 4) dic["ChangeType"] = " 提现手续费";
-if(ChangeType == 5) dic["ChangeType"] = " 提现税点扣除";
-if(ChangeType == 6) dic["ChangeType"] = " 提现失败，解冻";
-if(ChangeType == 7) dic["ChangeType"] = " 系统扣除";
-if(ChangeType == 10) dic["ChangeType"] = " 办卡奖励";
-if(ChangeType == 20) dic["ChangeType"] = " 余额支付";
-if(ChangeType == 21) dic["ChangeType"] = " 余额支付退款";
-if(ChangeType == 22) dic["ChangeType"] = " 余额支付退款手续费";
-if(ChangeType == 30) dic["ChangeType"] = " 签到红包";
-if(ChangeType == 31) dic["ChangeType"] = " 系统红包奖励";
-//产品类型
-int ProductType = int.Parse(dic["ProductType"].ToString());
-if(ProductType == 0) dic["ProductType"] = "星支付";
-if(ProductType == 1) dic["ProductType"] = "在线办卡";
-if(ProductType == 2) dic["ProductType"] = "环迅大POS";
-if(ProductType == 3) dic["ProductType"] = "系统奖励";
-if(ProductType == 4) dic["ProductType"] = "灵动商城";
-if(ProductType == 99) dic["ProductType"] = "提现";
+                int ChangeType = int.Parse(dic["ChangeType"].ToString());
+                if (ChangeType == 0) dic["ChangeType"] = " 激活奖励";
+                if (ChangeType == 1) dic["ChangeType"] = " 交易分润";
+                if (ChangeType == 2) dic["ChangeType"] = " 提现申请";
+                if (ChangeType == 3) dic["ChangeType"] = " 提现代付";
+                if (ChangeType == 4) dic["ChangeType"] = " 提现手续费";
+                if (ChangeType == 5) dic["ChangeType"] = " 提现税点扣除";
+                if (ChangeType == 6) dic["ChangeType"] = " 提现失败，解冻";
+                if (ChangeType == 7) dic["ChangeType"] = " 系统扣除";
+                if (ChangeType == 10) dic["ChangeType"] = " 办卡奖励";
+                if (ChangeType == 20) dic["ChangeType"] = " 余额支付";
+                if (ChangeType == 21) dic["ChangeType"] = " 余额支付退款";
+                if (ChangeType == 22) dic["ChangeType"] = " 余额支付退款手续费";
+                if (ChangeType == 30) dic["ChangeType"] = " 签到红包";
+                if (ChangeType == 31) dic["ChangeType"] = " 系统红包奖励";
+                //产品类型
+                int ProductType = int.Parse(dic["ProductType"].ToString());
+                if (ProductType == 0) dic["ProductType"] = "星支付";
+                if (ProductType == 1) dic["ProductType"] = "在线办卡";
+                if (ProductType == 2) dic["ProductType"] = "环迅大POS";
+                if (ProductType == 3) dic["ProductType"] = "系统奖励";
+                if (ProductType == 4) dic["ProductType"] = "灵动商城";
+                if (ProductType == 99) dic["ProductType"] = "提现";
 
             }
             return Json(obj);
@@ -117,7 +118,7 @@ if(ProductType == 99) dic["ProductType"] = "提现";
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
+
 
             return View();
         }
@@ -134,15 +135,15 @@ if(ProductType == 99) dic["ProductType"] = "提现";
         public string Add(HelpProfitAccountRecord data)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-            
-            
+
+
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Add("HelpProfitAccountRecord", Fields, 0);
+            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("HelpProfitAccountRecord", Fields, 0);
             AddSysLog(data.Id.ToString(), "HelpProfitAccountRecord", "add");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -158,7 +159,7 @@ if(ProductType == 99) dic["ProductType"] = "提现";
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
+
 
             HelpProfitAccountRecord editData = db.HelpProfitAccountRecord.FirstOrDefault(m => m.Id == Id) ?? new HelpProfitAccountRecord();
             ViewBag.data = editData;
@@ -177,15 +178,15 @@ if(ProductType == 99) dic["ProductType"] = "提现";
         public string Edit(HelpProfitAccountRecord data)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-            
-            
+
+
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitAccountRecord", Fields, data.Id);
-            AddSysLog(data.Id.ToString(),"HelpProfitAccountRecord","update");
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitAccountRecord", Fields, data.Id);
+            AddSysLog(data.Id.ToString(), "HelpProfitAccountRecord", "update");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -200,16 +201,16 @@ if(ProductType == 99) dic["ProductType"] = "提现";
         public string Delete(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitAccountRecord","del");
+            AddSysLog(Id, "HelpProfitAccountRecord", "del");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitAccountRecord", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitAccountRecord", Fields, id);
             }
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -224,13 +225,13 @@ if(ProductType == 99) dic["ProductType"] = "提现";
         public string Open(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitAccountRecord","open");
+            AddSysLog(Id, "HelpProfitAccountRecord", "open");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitAccountRecord", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitAccountRecord", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -247,13 +248,13 @@ if(ProductType == 99) dic["ProductType"] = "提现";
         public string Close(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitAccountRecord","close");
+            AddSysLog(Id, "HelpProfitAccountRecord", "close");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 0);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitAccountRecord", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitAccountRecord", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -268,8 +269,8 @@ if(ProductType == 99) dic["ProductType"] = "提现";
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Sort("HelpProfitAccountRecord", Sort, Id);
-            
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("HelpProfitAccountRecord", Sort, Id);
+
             AddSysLog(Id.ToString(), "HelpProfitAccountRecord", "sort");
             return "success";
         }
@@ -284,15 +285,15 @@ if(ProductType == 99) dic["ProductType"] = "提现";
         {
             ExcelData = HttpUtility.UrlDecode(ExcelData);
             JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count;i++ )
+            for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-                
+
                 db.HelpProfitAccountRecord.Add(new HelpProfitAccountRecord()
                 {
                     CreateDate = DateTime.Now,
                     UpdateDate = DateTime.Now,
-                    
+
                 });
                 db.SaveChanges();
             }
@@ -311,50 +312,50 @@ if(ProductType == 99) dic["ProductType"] = "提现";
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("CreateDate", "3"); //时间
-Fields.Add("TransRecordNo", "1"); //交易流水编号
+            Fields.Add("TransRecordNo", "1"); //交易流水编号
 
 
             string condition = " and Status>-1";
             //变动类型
-if (!string.IsNullOrEmpty(ChangeTypeSelect))
-{
-condition += " and ChangeType=" + ChangeTypeSelect;
-}
-//产品类型
-if (!string.IsNullOrEmpty(ProductTypeSelect))
-{
-condition += " and ProductType=" + ProductTypeSelect;
-}
+            if (!string.IsNullOrEmpty(ChangeTypeSelect))
+            {
+                condition += " and ChangeType=" + ChangeTypeSelect;
+            }
+            //产品类型
+            if (!string.IsNullOrEmpty(ProductTypeSelect))
+            {
+                condition += " and ProductType=" + ProductTypeSelect;
+            }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("HelpProfitAccountRecord", Fields, "Id desc", "0", 1, 20000, condition, "UserId,ChangeType,ProductType,ChangeAmount,BeforeTotalAmount,AfterTotalAmount,BeforeFreezeAmount,AfterFreezeAmount,BeforeBalanceAmount,AfterBalanceAmount,Remark,TransRecordNo", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("HelpProfitAccountRecord", Fields, "Id desc", "0", 1, 20000, condition, "UserId,ChangeType,ProductType,ChangeAmount,BeforeTotalAmount,AfterTotalAmount,BeforeFreezeAmount,AfterFreezeAmount,BeforeBalanceAmount,AfterBalanceAmount,Remark,TransRecordNo", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
                 //变动类型
-int ChangeType = int.Parse(dic["ChangeType"].ToString());
-if(ChangeType == 0) dic["ChangeType"] = " 激活奖励";
-if(ChangeType == 1) dic["ChangeType"] = " 交易分润";
-if(ChangeType == 2) dic["ChangeType"] = " 提现申请";
-if(ChangeType == 3) dic["ChangeType"] = " 提现代付";
-if(ChangeType == 4) dic["ChangeType"] = " 提现手续费";
-if(ChangeType == 5) dic["ChangeType"] = " 提现税点扣除";
-if(ChangeType == 6) dic["ChangeType"] = " 提现失败，解冻";
-if(ChangeType == 7) dic["ChangeType"] = " 系统扣除";
-if(ChangeType == 10) dic["ChangeType"] = " 办卡奖励";
-if(ChangeType == 20) dic["ChangeType"] = " 余额支付";
-if(ChangeType == 21) dic["ChangeType"] = " 余额支付退款";
-if(ChangeType == 22) dic["ChangeType"] = " 余额支付退款手续费";
-if(ChangeType == 30) dic["ChangeType"] = " 签到红包";
-if(ChangeType == 31) dic["ChangeType"] = " 系统红包奖励";
-//产品类型
-int ProductType = int.Parse(dic["ProductType"].ToString());
-if(ProductType == 0) dic["ProductType"] = "星支付";
-if(ProductType == 1) dic["ProductType"] = "在线办卡";
-if(ProductType == 2) dic["ProductType"] = "环迅大POS";
-if(ProductType == 3) dic["ProductType"] = "系统奖励";
-if(ProductType == 4) dic["ProductType"] = "灵动商城";
-if(ProductType == 99) dic["ProductType"] = "提现";
+                int ChangeType = int.Parse(dic["ChangeType"].ToString());
+                if (ChangeType == 0) dic["ChangeType"] = " 激活奖励";
+                if (ChangeType == 1) dic["ChangeType"] = " 交易分润";
+                if (ChangeType == 2) dic["ChangeType"] = " 提现申请";
+                if (ChangeType == 3) dic["ChangeType"] = " 提现代付";
+                if (ChangeType == 4) dic["ChangeType"] = " 提现手续费";
+                if (ChangeType == 5) dic["ChangeType"] = " 提现税点扣除";
+                if (ChangeType == 6) dic["ChangeType"] = " 提现失败，解冻";
+                if (ChangeType == 7) dic["ChangeType"] = " 系统扣除";
+                if (ChangeType == 10) dic["ChangeType"] = " 办卡奖励";
+                if (ChangeType == 20) dic["ChangeType"] = " 余额支付";
+                if (ChangeType == 21) dic["ChangeType"] = " 余额支付退款";
+                if (ChangeType == 22) dic["ChangeType"] = " 余额支付退款手续费";
+                if (ChangeType == 30) dic["ChangeType"] = " 签到红包";
+                if (ChangeType == 31) dic["ChangeType"] = " 系统红包奖励";
+                //产品类型
+                int ProductType = int.Parse(dic["ProductType"].ToString());
+                if (ProductType == 0) dic["ProductType"] = "星支付";
+                if (ProductType == 1) dic["ProductType"] = "在线办卡";
+                if (ProductType == 2) dic["ProductType"] = "环迅大POS";
+                if (ProductType == 3) dic["ProductType"] = "系统奖励";
+                if (ProductType == 4) dic["ProductType"] = "灵动商城";
+                if (ProductType == 99) dic["ProductType"] = "提现";
 
             }
 
@@ -364,17 +365,17 @@ if(ProductType == 99) dic["ProductType"] = "提现";
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("UserId", "创客");
-ReturnFields.Add("ChangeType", "变动类型");
-ReturnFields.Add("ProductType", "产品类型");
-ReturnFields.Add("ChangeAmount", "变更金额");
-ReturnFields.Add("BeforeTotalAmount", "变更前总金额");
-ReturnFields.Add("AfterTotalAmount", "变更后总金额");
-ReturnFields.Add("BeforeFreezeAmount", "变更前冻结金额");
-ReturnFields.Add("AfterFreezeAmount", "变更后冻结金额");
-ReturnFields.Add("BeforeBalanceAmount", "变更前余额");
-ReturnFields.Add("AfterBalanceAmount", "变更后余额");
-ReturnFields.Add("Remark", "账户变动明细备注信息");
-ReturnFields.Add("TransRecordNo", "交易流水编号");
+            ReturnFields.Add("ChangeType", "变动类型");
+            ReturnFields.Add("ProductType", "产品类型");
+            ReturnFields.Add("ChangeAmount", "变更金额");
+            ReturnFields.Add("BeforeTotalAmount", "变更前总金额");
+            ReturnFields.Add("AfterTotalAmount", "变更后总金额");
+            ReturnFields.Add("BeforeFreezeAmount", "变更前冻结金额");
+            ReturnFields.Add("AfterFreezeAmount", "变更后冻结金额");
+            ReturnFields.Add("BeforeBalanceAmount", "变更前余额");
+            ReturnFields.Add("AfterBalanceAmount", "变更后余额");
+            ReturnFields.Add("Remark", "账户变动明细备注信息");
+            ReturnFields.Add("TransRecordNo", "交易流水编号");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "HelpProfitAccountRecord", "ExportExcel");

Areas/Admin/Controllers/MainServer/HelpProfitExchangeController.cs

@@ -25,6 +25,7 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public HelpProfitExchangeController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
+            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
         }
 
         #region 助利宝兑换记录列表
@@ -37,8 +38,8 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
-            
+
+
             return View();
         }
 
@@ -52,35 +53,35 @@ namespace MySystem.Areas.Admin.Controllers
         /// <returns></returns>
         public JsonResult IndexData(HelpProfitExchange data, string UserIdMakerCode, string UserIdRealName, int page = 1, int limit = 30)
         {
-            
+
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            
+
             Fields.Add("CreateDate", "3"); //时间
 
 
             string condition = " and Status>-1";
             //创客创客编号
-if (!string.IsNullOrEmpty(UserIdMakerCode))
-{
-condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
-}
-//创客真实姓名
-if (!string.IsNullOrEmpty(UserIdRealName))
-{
-condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
-}
+            if (!string.IsNullOrEmpty(UserIdMakerCode))
+            {
+                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+            }
+            //创客真实姓名
+            if (!string.IsNullOrEmpty(UserIdRealName))
+            {
+                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+            }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("HelpProfitExchange", Fields, "Id desc", "0", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("HelpProfitExchange", 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(function.CheckInt(dic["UserId"].ToString()));
-Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
-dic["UserIdMakerCode"] = userid_Users.MakerCode;
-dic["UserIdRealName"] = userid_Users.RealName;
-dic.Remove("UserId");
+                int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
+                Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                dic["UserIdMakerCode"] = userid_Users.MakerCode;
+                dic["UserIdRealName"] = userid_Users.RealName;
+                dic.Remove("UserId");
 
             }
             return Json(obj);
@@ -98,7 +99,7 @@ dic.Remove("UserId");
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
+
 
             return View();
         }
@@ -115,17 +116,17 @@ dic.Remove("UserId");
         public string Add(HelpProfitExchange data)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-            
+
             Fields.Add("UserId", data.UserId); //创客
-Fields.Add("ExchangeCount", data.ExchangeCount); //兑换数量
+            Fields.Add("ExchangeCount", data.ExchangeCount); //兑换数量
 
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Add("HelpProfitExchange", Fields, 0);
+            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("HelpProfitExchange", Fields, 0);
             AddSysLog(data.Id.ToString(), "HelpProfitExchange", "add");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -141,7 +142,7 @@ Fields.Add("ExchangeCount", data.ExchangeCount); //兑换数量
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
+
 
             HelpProfitExchange editData = db.HelpProfitExchange.FirstOrDefault(m => m.Id == Id) ?? new HelpProfitExchange();
             ViewBag.data = editData;
@@ -160,17 +161,17 @@ Fields.Add("ExchangeCount", data.ExchangeCount); //兑换数量
         public string Edit(HelpProfitExchange data)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-            
+
             Fields.Add("UserId", data.UserId); //创客
-Fields.Add("ExchangeCount", data.ExchangeCount); //兑换数量
+            Fields.Add("ExchangeCount", data.ExchangeCount); //兑换数量
 
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitExchange", Fields, data.Id);
-            AddSysLog(data.Id.ToString(),"HelpProfitExchange","update");
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitExchange", Fields, data.Id);
+            AddSysLog(data.Id.ToString(), "HelpProfitExchange", "update");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -185,16 +186,16 @@ Fields.Add("ExchangeCount", data.ExchangeCount); //兑换数量
         public string Delete(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitExchange","del");
+            AddSysLog(Id, "HelpProfitExchange", "del");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitExchange", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitExchange", Fields, id);
             }
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -209,13 +210,13 @@ Fields.Add("ExchangeCount", data.ExchangeCount); //兑换数量
         public string Open(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitExchange","open");
+            AddSysLog(Id, "HelpProfitExchange", "open");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitExchange", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitExchange", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -232,13 +233,13 @@ Fields.Add("ExchangeCount", data.ExchangeCount); //兑换数量
         public string Close(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitExchange","close");
+            AddSysLog(Id, "HelpProfitExchange", "close");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 0);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitExchange", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitExchange", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -253,8 +254,8 @@ Fields.Add("ExchangeCount", data.ExchangeCount); //兑换数量
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Sort("HelpProfitExchange", Sort, Id);
-            
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("HelpProfitExchange", Sort, Id);
+
             AddSysLog(Id.ToString(), "HelpProfitExchange", "sort");
             return "success";
         }
@@ -269,15 +270,15 @@ Fields.Add("ExchangeCount", data.ExchangeCount); //兑换数量
         {
             ExcelData = HttpUtility.UrlDecode(ExcelData);
             JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count;i++ )
+            for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-                
+
                 db.HelpProfitExchange.Add(new HelpProfitExchange()
                 {
                     CreateDate = DateTime.Now,
                     UpdateDate = DateTime.Now,
-                    
+
                 });
                 db.SaveChanges();
             }
@@ -300,27 +301,27 @@ Fields.Add("ExchangeCount", data.ExchangeCount); //兑换数量
 
             string condition = " and Status>-1";
             //创客创客编号
-if (!string.IsNullOrEmpty(UserIdMakerCode))
-{
-condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
-}
-//创客真实姓名
-if (!string.IsNullOrEmpty(UserIdRealName))
-{
-condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
-}
+            if (!string.IsNullOrEmpty(UserIdMakerCode))
+            {
+                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+            }
+            //创客真实姓名
+            if (!string.IsNullOrEmpty(UserIdRealName))
+            {
+                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+            }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("HelpProfitExchange", Fields, "Id desc", "0", 1, 20000, condition, "UserId,ExchangeCount", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("HelpProfitExchange", Fields, "Id desc", "0", 1, 20000, condition, "UserId,ExchangeCount", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
                 //创客
-int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
-Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
-dic["UserIdMakerCode"] = userid_Users.MakerCode;
-dic["UserIdRealName"] = userid_Users.RealName;
-dic.Remove("UserId");
+                int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
+                Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                dic["UserIdMakerCode"] = userid_Users.MakerCode;
+                dic["UserIdRealName"] = userid_Users.RealName;
+                dic.Remove("UserId");
 
             }
 
@@ -330,8 +331,8 @@ dic.Remove("UserId");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("UserIdMakerCode", "创客创客编号");
-ReturnFields.Add("UserIdRealName", "创客真实姓名");
-ReturnFields.Add("ExchangeCount", "兑换数量");
+            ReturnFields.Add("UserIdRealName", "创客真实姓名");
+            ReturnFields.Add("ExchangeCount", "兑换数量");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "HelpProfitExchange", "ExportExcel");

Areas/Admin/Controllers/MainServer/HelpProfitExchangeDetailController.cs

@@ -25,6 +25,7 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public HelpProfitExchangeDetailController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
+            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
         }
 
         #region 助利宝兑换明细列表
@@ -39,7 +40,7 @@ namespace MySystem.Areas.Admin.Controllers
             ViewBag.right = right;
             ViewBag.RecordId = RecordId;
 
-            
+
             return View();
         }
 
@@ -53,44 +54,44 @@ namespace MySystem.Areas.Admin.Controllers
         /// <returns></returns>
         public JsonResult IndexData(HelpProfitExchangeDetail data, string UserIdMakerCode, string UserIdRealName, string PosCouponIdSelect, int page = 1, int limit = 30)
         {
-            
+
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("RecordId", "1");
 
             Fields.Add("CreateDate", "3"); //时间
-Fields.Add("ExchangeCode", "1"); //兑换券码
+            Fields.Add("ExchangeCode", "1"); //兑换券码
 
 
             string condition = " and Status>-1";
             //创客创客编号
-if (!string.IsNullOrEmpty(UserIdMakerCode))
-{
-condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
-}
-//创客真实姓名
-if (!string.IsNullOrEmpty(UserIdRealName))
-{
-condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
-}
-//券码
-if (!string.IsNullOrEmpty(PosCouponIdSelect))
-{
-condition += " and PosCouponId=" + PosCouponIdSelect;
-}
+            if (!string.IsNullOrEmpty(UserIdMakerCode))
+            {
+                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+            }
+            //创客真实姓名
+            if (!string.IsNullOrEmpty(UserIdRealName))
+            {
+                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+            }
+            //券码
+            if (!string.IsNullOrEmpty(PosCouponIdSelect))
+            {
+                condition += " and PosCouponId=" + PosCouponIdSelect;
+            }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("HelpProfitExchangeDetail", Fields, "Id desc", "0", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("HelpProfitExchangeDetail", 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(function.CheckInt(dic["UserId"].ToString()));
-Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
-dic["UserIdMakerCode"] = userid_Users.MakerCode;
-dic["UserIdRealName"] = userid_Users.RealName;
-dic.Remove("UserId");
-//券码
-dic["PosCouponId"] = RelationClass.GetPosCouponsInfo(int.Parse(dic["PosCouponId"].ToString()));
+                int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
+                Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                dic["UserIdMakerCode"] = userid_Users.MakerCode;
+                dic["UserIdRealName"] = userid_Users.RealName;
+                dic.Remove("UserId");
+                //券码
+                dic["PosCouponId"] = RelationClass.GetPosCouponsInfo(int.Parse(dic["PosCouponId"].ToString()));
 
             }
             return Json(obj);
@@ -129,16 +130,16 @@ dic["PosCouponId"] = RelationClass.GetPosCouponsInfo(int.Parse(dic["PosCouponId"
             Fields.Add("RecordId", data.RecordId);
 
             Fields.Add("UserId", data.UserId); //创客
-Fields.Add("PosCouponId", data.PosCouponId); //券码
-Fields.Add("ExchangeCode", data.ExchangeCode); //兑换券码
+            Fields.Add("PosCouponId", data.PosCouponId); //券码
+            Fields.Add("ExchangeCode", data.ExchangeCode); //兑换券码
 
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Add("HelpProfitExchangeDetail", Fields, 0);
+            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("HelpProfitExchangeDetail", Fields, 0);
             AddSysLog(data.Id.ToString(), "HelpProfitExchangeDetail", "add");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -177,16 +178,16 @@ Fields.Add("ExchangeCode", data.ExchangeCode); //兑换券码
             Fields.Add("RecordId", data.RecordId);
 
             Fields.Add("UserId", data.UserId); //创客
-Fields.Add("PosCouponId", data.PosCouponId); //券码
-Fields.Add("ExchangeCode", data.ExchangeCode); //兑换券码
+            Fields.Add("PosCouponId", data.PosCouponId); //券码
+            Fields.Add("ExchangeCode", data.ExchangeCode); //兑换券码
 
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitExchangeDetail", Fields, data.Id);
-            AddSysLog(data.Id.ToString(),"HelpProfitExchangeDetail","update");
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitExchangeDetail", Fields, data.Id);
+            AddSysLog(data.Id.ToString(), "HelpProfitExchangeDetail", "update");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -201,16 +202,16 @@ Fields.Add("ExchangeCode", data.ExchangeCode); //兑换券码
         public string Delete(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitExchangeDetail","del");
+            AddSysLog(Id, "HelpProfitExchangeDetail", "del");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitExchangeDetail", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitExchangeDetail", Fields, id);
             }
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -225,13 +226,13 @@ Fields.Add("ExchangeCode", data.ExchangeCode); //兑换券码
         public string Open(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitExchangeDetail","open");
+            AddSysLog(Id, "HelpProfitExchangeDetail", "open");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitExchangeDetail", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitExchangeDetail", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -248,13 +249,13 @@ Fields.Add("ExchangeCode", data.ExchangeCode); //兑换券码
         public string Close(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitExchangeDetail","close");
+            AddSysLog(Id, "HelpProfitExchangeDetail", "close");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 0);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitExchangeDetail", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitExchangeDetail", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -269,8 +270,8 @@ Fields.Add("ExchangeCode", data.ExchangeCode); //兑换券码
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Sort("HelpProfitExchangeDetail", Sort, Id);
-            
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("HelpProfitExchangeDetail", Sort, Id);
+
             AddSysLog(Id.ToString(), "HelpProfitExchangeDetail", "sort");
             return "success";
         }
@@ -285,15 +286,15 @@ Fields.Add("ExchangeCode", data.ExchangeCode); //兑换券码
         {
             ExcelData = HttpUtility.UrlDecode(ExcelData);
             JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count;i++ )
+            for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-                
+
                 db.HelpProfitExchangeDetail.Add(new HelpProfitExchangeDetail()
                 {
                     CreateDate = DateTime.Now,
                     UpdateDate = DateTime.Now,
-                    
+
                 });
                 db.SaveChanges();
             }
@@ -312,39 +313,39 @@ Fields.Add("ExchangeCode", data.ExchangeCode); //兑换券码
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("CreateDate", "3"); //时间
-Fields.Add("ExchangeCode", "1"); //兑换券码
+            Fields.Add("ExchangeCode", "1"); //兑换券码
 
 
             string condition = " and Status>-1";
             //创客创客编号
-if (!string.IsNullOrEmpty(UserIdMakerCode))
-{
-condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
-}
-//创客真实姓名
-if (!string.IsNullOrEmpty(UserIdRealName))
-{
-condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
-}
-//券码
-if (!string.IsNullOrEmpty(PosCouponIdSelect))
-{
-condition += " and PosCouponId=" + PosCouponIdSelect;
-}
+            if (!string.IsNullOrEmpty(UserIdMakerCode))
+            {
+                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+            }
+            //创客真实姓名
+            if (!string.IsNullOrEmpty(UserIdRealName))
+            {
+                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+            }
+            //券码
+            if (!string.IsNullOrEmpty(PosCouponIdSelect))
+            {
+                condition += " and PosCouponId=" + PosCouponIdSelect;
+            }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("HelpProfitExchangeDetail", Fields, "Id desc", "0", 1, 20000, condition, "UserId,PosCouponId,ExchangeCode", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("HelpProfitExchangeDetail", Fields, "Id desc", "0", 1, 20000, condition, "UserId,PosCouponId,ExchangeCode", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
                 //创客
-int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
-Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
-dic["UserIdMakerCode"] = userid_Users.MakerCode;
-dic["UserIdRealName"] = userid_Users.RealName;
-dic.Remove("UserId");
-//券码
-dic["PosCouponId"] = RelationClass.GetPosCouponsInfo(int.Parse(dic["PosCouponId"].ToString()));
+                int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
+                Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                dic["UserIdMakerCode"] = userid_Users.MakerCode;
+                dic["UserIdRealName"] = userid_Users.RealName;
+                dic.Remove("UserId");
+                //券码
+                dic["PosCouponId"] = RelationClass.GetPosCouponsInfo(int.Parse(dic["PosCouponId"].ToString()));
 
             }
 
@@ -354,9 +355,9 @@ dic["PosCouponId"] = RelationClass.GetPosCouponsInfo(int.Parse(dic["PosCouponId"
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("UserIdMakerCode", "创客创客编号");
-ReturnFields.Add("UserIdRealName", "创客真实姓名");
-ReturnFields.Add("PosCouponId", "券码");
-ReturnFields.Add("ExchangeCode", "兑换券码");
+            ReturnFields.Add("UserIdRealName", "创客真实姓名");
+            ReturnFields.Add("PosCouponId", "券码");
+            ReturnFields.Add("ExchangeCode", "兑换券码");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "HelpProfitExchangeDetail", "ExportExcel");

Areas/Admin/Controllers/MainServer/HelpProfitMerTradeSummayController.cs

@@ -25,6 +25,7 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public HelpProfitMerTradeSummayController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
+            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
         }
 
         #region 助利宝商户交易额统计列表
@@ -37,8 +38,8 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
-            
+
+
             return View();
         }
 
@@ -52,29 +53,29 @@ namespace MySystem.Areas.Admin.Controllers
         /// <returns></returns>
         public JsonResult IndexData(HelpProfitMerTradeSummay data, string MerchantIdSelect, string BrandIdSelect, int page = 1, int limit = 30)
         {
-            
+
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            
-            
+
+
 
             string condition = " and Status>-1";
             //商户
-if (!string.IsNullOrEmpty(MerchantIdSelect))
-{
-condition += " and MerchantId=" + MerchantIdSelect;
-}
-//品牌
-if (!string.IsNullOrEmpty(BrandIdSelect))
-{
-condition += " and BrandId=" + BrandIdSelect;
-}
+            if (!string.IsNullOrEmpty(MerchantIdSelect))
+            {
+                condition += " and MerchantId=" + MerchantIdSelect;
+            }
+            //品牌
+            if (!string.IsNullOrEmpty(BrandIdSelect))
+            {
+                condition += " and BrandId=" + BrandIdSelect;
+            }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("HelpProfitMerTradeSummay", Fields, "Id desc", "0", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("HelpProfitMerTradeSummay", 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)
             {
-                
+
             }
             return Json(obj);
         }
@@ -91,7 +92,7 @@ condition += " and BrandId=" + BrandIdSelect;
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
+
 
             return View();
         }
@@ -108,15 +109,15 @@ condition += " and BrandId=" + BrandIdSelect;
         public string Add(HelpProfitMerTradeSummay data)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-            
-            
+
+
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Add("HelpProfitMerTradeSummay", Fields, 0);
+            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("HelpProfitMerTradeSummay", Fields, 0);
             AddSysLog(data.Id.ToString(), "HelpProfitMerTradeSummay", "add");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -132,7 +133,7 @@ condition += " and BrandId=" + BrandIdSelect;
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
+
 
             HelpProfitMerTradeSummay editData = db.HelpProfitMerTradeSummay.FirstOrDefault(m => m.Id == Id) ?? new HelpProfitMerTradeSummay();
             ViewBag.data = editData;
@@ -151,15 +152,15 @@ condition += " and BrandId=" + BrandIdSelect;
         public string Edit(HelpProfitMerTradeSummay data)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-            
-            
+
+
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitMerTradeSummay", Fields, data.Id);
-            AddSysLog(data.Id.ToString(),"HelpProfitMerTradeSummay","update");
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitMerTradeSummay", Fields, data.Id);
+            AddSysLog(data.Id.ToString(), "HelpProfitMerTradeSummay", "update");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -174,16 +175,16 @@ condition += " and BrandId=" + BrandIdSelect;
         public string Delete(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitMerTradeSummay","del");
+            AddSysLog(Id, "HelpProfitMerTradeSummay", "del");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitMerTradeSummay", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitMerTradeSummay", Fields, id);
             }
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -198,13 +199,13 @@ condition += " and BrandId=" + BrandIdSelect;
         public string Open(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitMerTradeSummay","open");
+            AddSysLog(Id, "HelpProfitMerTradeSummay", "open");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitMerTradeSummay", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitMerTradeSummay", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -221,13 +222,13 @@ condition += " and BrandId=" + BrandIdSelect;
         public string Close(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitMerTradeSummay","close");
+            AddSysLog(Id, "HelpProfitMerTradeSummay", "close");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 0);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitMerTradeSummay", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitMerTradeSummay", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -242,8 +243,8 @@ condition += " and BrandId=" + BrandIdSelect;
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Sort("HelpProfitMerTradeSummay", Sort, Id);
-            
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("HelpProfitMerTradeSummay", Sort, Id);
+
             AddSysLog(Id.ToString(), "HelpProfitMerTradeSummay", "sort");
             return "success";
         }
@@ -258,15 +259,15 @@ condition += " and BrandId=" + BrandIdSelect;
         {
             ExcelData = HttpUtility.UrlDecode(ExcelData);
             JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count;i++ )
+            for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-                
+
                 db.HelpProfitMerTradeSummay.Add(new HelpProfitMerTradeSummay()
                 {
                     CreateDate = DateTime.Now,
                     UpdateDate = DateTime.Now,
-                    
+
                 });
                 db.SaveChanges();
             }
@@ -284,26 +285,26 @@ condition += " and BrandId=" + BrandIdSelect;
         public JsonResult ExportExcel(HelpProfitMerTradeSummay data, string MerchantIdSelect, string BrandIdSelect)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            
+
 
             string condition = " and Status>-1";
             //商户
-if (!string.IsNullOrEmpty(MerchantIdSelect))
-{
-condition += " and MerchantId=" + MerchantIdSelect;
-}
-//品牌
-if (!string.IsNullOrEmpty(BrandIdSelect))
-{
-condition += " and BrandId=" + BrandIdSelect;
-}
+            if (!string.IsNullOrEmpty(MerchantIdSelect))
+            {
+                condition += " and MerchantId=" + MerchantIdSelect;
+            }
+            //品牌
+            if (!string.IsNullOrEmpty(BrandIdSelect))
+            {
+                condition += " and BrandId=" + BrandIdSelect;
+            }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("HelpProfitMerTradeSummay", Fields, "Id desc", "0", 1, 20000, condition, "", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("HelpProfitMerTradeSummay", Fields, "Id desc", "0", 1, 20000, condition, "", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-                
+
             }
 
             Dictionary<string, object> result = new Dictionary<string, object>();
@@ -311,7 +312,7 @@ condition += " and BrandId=" + BrandIdSelect;
             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>();
-            
+
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "HelpProfitMerTradeSummay", "ExportExcel");
             return Json(result);

Areas/Admin/Controllers/MainServer/HelpProfitMerchantForUserController.cs

@@ -25,6 +25,7 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public HelpProfitMerchantForUserController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
+            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
         }
 
         #region 助利宝商户关联表列表
@@ -37,8 +38,8 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
-            
+
+
             return View();
         }
 
@@ -52,42 +53,40 @@ namespace MySystem.Areas.Admin.Controllers
         /// <returns></returns>
         public JsonResult IndexData(HelpProfitMerchantForUser data, string UserIdMakerCode, string UserIdRealName, string MerchantIdSelect, int page = 1, int limit = 30)
         {
-            
+
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            
+
             Fields.Add("MerNo", "1"); //商户编号
 
 
             string condition = " and Status>-1";
             //创客创客编号
-if (!string.IsNullOrEmpty(UserIdMakerCode))
-{
-condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
-}
-//创客真实姓名
-if (!string.IsNullOrEmpty(UserIdRealName))
-{
-condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
-}
-//商户
-if (!string.IsNullOrEmpty(MerchantIdSelect))
-{
-condition += " and MerchantId=" + MerchantIdSelect;
-}
+            if (!string.IsNullOrEmpty(UserIdMakerCode))
+            {
+                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+            }
+            //创客真实姓名
+            if (!string.IsNullOrEmpty(UserIdRealName))
+            {
+                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+            }
+            //商户
+            if (!string.IsNullOrEmpty(MerchantIdSelect))
+            {
+                condition += " and MerchantId=" + MerchantIdSelect;
+            }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("HelpProfitMerchantForUser", Fields, "Id desc", "0", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("HelpProfitMerchantForUser", 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(function.CheckInt(dic["UserId"].ToString()));
-Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
-dic["UserIdMakerCode"] = userid_Users.MakerCode;
-dic["UserIdRealName"] = userid_Users.RealName;
-dic.Remove("UserId");
-//商户
-dic["MerchantId"] = RelationClass.GetPosMerchantInfoInfo(int.Parse(dic["MerchantId"].ToString()));
+                int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
+                Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                dic["UserIdMakerCode"] = userid_Users.MakerCode;
+                dic["UserIdRealName"] = userid_Users.RealName;
+                dic.Remove("UserId");
 
             }
             return Json(obj);
@@ -105,7 +104,7 @@ dic["MerchantId"] = RelationClass.GetPosMerchantInfoInfo(int.Parse(dic["Merchant
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
+
 
             return View();
         }
@@ -122,15 +121,15 @@ dic["MerchantId"] = RelationClass.GetPosMerchantInfoInfo(int.Parse(dic["Merchant
         public string Add(HelpProfitMerchantForUser data)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-            
-            
+
+
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Add("HelpProfitMerchantForUser", Fields, 0);
+            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("HelpProfitMerchantForUser", Fields, 0);
             AddSysLog(data.Id.ToString(), "HelpProfitMerchantForUser", "add");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -146,7 +145,7 @@ dic["MerchantId"] = RelationClass.GetPosMerchantInfoInfo(int.Parse(dic["Merchant
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
+
 
             HelpProfitMerchantForUser editData = db.HelpProfitMerchantForUser.FirstOrDefault(m => m.Id == Id) ?? new HelpProfitMerchantForUser();
             ViewBag.data = editData;
@@ -165,15 +164,15 @@ dic["MerchantId"] = RelationClass.GetPosMerchantInfoInfo(int.Parse(dic["Merchant
         public string Edit(HelpProfitMerchantForUser data)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-            
-            
+
+
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitMerchantForUser", Fields, data.Id);
-            AddSysLog(data.Id.ToString(),"HelpProfitMerchantForUser","update");
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitMerchantForUser", Fields, data.Id);
+            AddSysLog(data.Id.ToString(), "HelpProfitMerchantForUser", "update");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -188,16 +187,16 @@ dic["MerchantId"] = RelationClass.GetPosMerchantInfoInfo(int.Parse(dic["Merchant
         public string Delete(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitMerchantForUser","del");
+            AddSysLog(Id, "HelpProfitMerchantForUser", "del");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitMerchantForUser", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitMerchantForUser", Fields, id);
             }
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -212,13 +211,13 @@ dic["MerchantId"] = RelationClass.GetPosMerchantInfoInfo(int.Parse(dic["Merchant
         public string Open(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitMerchantForUser","open");
+            AddSysLog(Id, "HelpProfitMerchantForUser", "open");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitMerchantForUser", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitMerchantForUser", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -235,13 +234,13 @@ dic["MerchantId"] = RelationClass.GetPosMerchantInfoInfo(int.Parse(dic["Merchant
         public string Close(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitMerchantForUser","close");
+            AddSysLog(Id, "HelpProfitMerchantForUser", "close");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 0);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitMerchantForUser", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitMerchantForUser", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -256,8 +255,8 @@ dic["MerchantId"] = RelationClass.GetPosMerchantInfoInfo(int.Parse(dic["Merchant
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Sort("HelpProfitMerchantForUser", Sort, Id);
-            
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("HelpProfitMerchantForUser", Sort, Id);
+
             AddSysLog(Id.ToString(), "HelpProfitMerchantForUser", "sort");
             return "success";
         }
@@ -272,15 +271,15 @@ dic["MerchantId"] = RelationClass.GetPosMerchantInfoInfo(int.Parse(dic["Merchant
         {
             ExcelData = HttpUtility.UrlDecode(ExcelData);
             JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count;i++ )
+            for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-                
+
                 db.HelpProfitMerchantForUser.Add(new HelpProfitMerchantForUser()
                 {
                     CreateDate = DateTime.Now,
                     UpdateDate = DateTime.Now,
-                    
+
                 });
                 db.SaveChanges();
             }
@@ -303,34 +302,32 @@ dic["MerchantId"] = RelationClass.GetPosMerchantInfoInfo(int.Parse(dic["Merchant
 
             string condition = " and Status>-1";
             //创客创客编号
-if (!string.IsNullOrEmpty(UserIdMakerCode))
-{
-condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
-}
-//创客真实姓名
-if (!string.IsNullOrEmpty(UserIdRealName))
-{
-condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
-}
-//商户
-if (!string.IsNullOrEmpty(MerchantIdSelect))
-{
-condition += " and MerchantId=" + MerchantIdSelect;
-}
+            if (!string.IsNullOrEmpty(UserIdMakerCode))
+            {
+                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+            }
+            //创客真实姓名
+            if (!string.IsNullOrEmpty(UserIdRealName))
+            {
+                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+            }
+            //商户
+            if (!string.IsNullOrEmpty(MerchantIdSelect))
+            {
+                condition += " and MerchantId=" + MerchantIdSelect;
+            }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("HelpProfitMerchantForUser", Fields, "Id desc", "0", 1, 20000, condition, "UserId,MerchantId,MerNo", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("HelpProfitMerchantForUser", Fields, "Id desc", "0", 1, 20000, condition, "UserId,MerchantId,MerNo", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
                 //创客
-int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
-Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
-dic["UserIdMakerCode"] = userid_Users.MakerCode;
-dic["UserIdRealName"] = userid_Users.RealName;
-dic.Remove("UserId");
-//商户
-dic["MerchantId"] = RelationClass.GetPosMerchantInfoInfo(int.Parse(dic["MerchantId"].ToString()));
+                int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
+                Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                dic["UserIdMakerCode"] = userid_Users.MakerCode;
+                dic["UserIdRealName"] = userid_Users.RealName;
+                dic.Remove("UserId");
 
             }
 
@@ -340,9 +337,9 @@ dic["MerchantId"] = RelationClass.GetPosMerchantInfoInfo(int.Parse(dic["Merchant
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("UserIdMakerCode", "创客创客编号");
-ReturnFields.Add("UserIdRealName", "创客真实姓名");
-ReturnFields.Add("MerchantId", "商户");
-ReturnFields.Add("MerNo", "商户编号");
+            ReturnFields.Add("UserIdRealName", "创客真实姓名");
+            ReturnFields.Add("MerchantId", "商户");
+            ReturnFields.Add("MerNo", "商户编号");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "HelpProfitMerchantForUser", "ExportExcel");

Areas/Admin/Controllers/MainServer/HelpProfitRebateDetailController.cs

@@ -25,6 +25,7 @@ namespace MySystem.Areas.Admin.Controllers
     {
         public HelpProfitRebateDetailController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
         {
+            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
         }
 
         #region 助利宝返利明细表列表
@@ -37,8 +38,8 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
-            
+
+
             return View();
         }
 
@@ -52,31 +53,31 @@ namespace MySystem.Areas.Admin.Controllers
         /// <returns></returns>
         public JsonResult IndexData(HelpProfitRebateDetail data, string ProductTypeSelect, int page = 1, int limit = 30)
         {
-            
+
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            
+
             Fields.Add("CreateDate", "3"); //时间
 
 
             string condition = " and Status>-1";
             //产品类型
-if (!string.IsNullOrEmpty(ProductTypeSelect))
-{
-condition += " and ProductType=" + ProductTypeSelect;
-}
+            if (!string.IsNullOrEmpty(ProductTypeSelect))
+            {
+                condition += " and ProductType=" + ProductTypeSelect;
+            }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("HelpProfitRebateDetail", Fields, "Id desc", "0", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("HelpProfitRebateDetail", 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 ProductType = int.Parse(dic["ProductType"].ToString());
-if(ProductType == 1) dic["ProductType"] = "在线办卡";
-if(ProductType == 3) dic["ProductType"] = "系统奖励";
-if(ProductType == 4) dic["ProductType"] = "灵动商城";
-if(ProductType == 5) dic["ProductType"] = "快钱Mpos";
-if(ProductType == 0) dic["ProductType"] = "";
+                int ProductType = int.Parse(dic["ProductType"].ToString());
+                if (ProductType == 1) dic["ProductType"] = "在线办卡";
+                if (ProductType == 3) dic["ProductType"] = "系统奖励";
+                if (ProductType == 4) dic["ProductType"] = "灵动商城";
+                if (ProductType == 5) dic["ProductType"] = "快钱Mpos";
+                if (ProductType == 0) dic["ProductType"] = "";
 
             }
             return Json(obj);
@@ -94,7 +95,7 @@ if(ProductType == 0) dic["ProductType"] = "";
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
+
 
             return View();
         }
@@ -111,16 +112,16 @@ if(ProductType == 0) dic["ProductType"] = "";
         public string Add(HelpProfitRebateDetail data)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-            
+
             Fields.Add("Remark", data.Remark); //备注
 
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Add("HelpProfitRebateDetail", Fields, 0);
+            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("HelpProfitRebateDetail", Fields, 0);
             AddSysLog(data.Id.ToString(), "HelpProfitRebateDetail", "add");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -136,7 +137,7 @@ if(ProductType == 0) dic["ProductType"] = "";
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
+
 
             HelpProfitRebateDetail editData = db.HelpProfitRebateDetail.FirstOrDefault(m => m.Id == Id) ?? new HelpProfitRebateDetail();
             ViewBag.data = editData;
@@ -155,16 +156,16 @@ if(ProductType == 0) dic["ProductType"] = "";
         public string Edit(HelpProfitRebateDetail data)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-            
+
             Fields.Add("Remark", data.Remark); //备注
 
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitRebateDetail", Fields, data.Id);
-            AddSysLog(data.Id.ToString(),"HelpProfitRebateDetail","update");
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitRebateDetail", Fields, data.Id);
+            AddSysLog(data.Id.ToString(), "HelpProfitRebateDetail", "update");
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -179,16 +180,16 @@ if(ProductType == 0) dic["ProductType"] = "";
         public string Delete(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitRebateDetail","del");
+            AddSysLog(Id, "HelpProfitRebateDetail", "del");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitRebateDetail", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitRebateDetail", Fields, id);
             }
             db.SaveChanges();
-            
+
             return "success";
         }
 
@@ -203,13 +204,13 @@ if(ProductType == 0) dic["ProductType"] = "";
         public string Open(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitRebateDetail","open");
+            AddSysLog(Id, "HelpProfitRebateDetail", "open");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 1);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitRebateDetail", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitRebateDetail", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -226,13 +227,13 @@ if(ProductType == 0) dic["ProductType"] = "";
         public string Close(string Id)
         {
             string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"HelpProfitRebateDetail","close");
+            AddSysLog(Id, "HelpProfitRebateDetail", "close");
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", 0);
-                new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("HelpProfitRebateDetail", Fields, id);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("HelpProfitRebateDetail", Fields, id);
             }
             db.SaveChanges();
             return "success";
@@ -247,8 +248,8 @@ if(ProductType == 0) dic["ProductType"] = "";
         /// <param name="Id"></param>
         public string Sort(int Id, int Sort)
         {
-            new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Sort("HelpProfitRebateDetail", Sort, Id);
-            
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("HelpProfitRebateDetail", Sort, Id);
+
             AddSysLog(Id.ToString(), "HelpProfitRebateDetail", "sort");
             return "success";
         }
@@ -263,15 +264,15 @@ if(ProductType == 0) dic["ProductType"] = "";
         {
             ExcelData = HttpUtility.UrlDecode(ExcelData);
             JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count;i++ )
+            for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-                
+
                 db.HelpProfitRebateDetail.Add(new HelpProfitRebateDetail()
                 {
                     CreateDate = DateTime.Now,
                     UpdateDate = DateTime.Now,
-                    
+
                 });
                 db.SaveChanges();
             }
@@ -294,23 +295,23 @@ if(ProductType == 0) dic["ProductType"] = "";
 
             string condition = " and Status>-1";
             //产品类型
-if (!string.IsNullOrEmpty(ProductTypeSelect))
-{
-condition += " and ProductType=" + ProductTypeSelect;
-}
+            if (!string.IsNullOrEmpty(ProductTypeSelect))
+            {
+                condition += " and ProductType=" + ProductTypeSelect;
+            }
 
 
-            Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("HelpProfitRebateDetail", Fields, "Id desc", "0", 1, 20000, condition, "", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("HelpProfitRebateDetail", Fields, "Id desc", "0", 1, 20000, condition, "", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
                 //产品类型
-int ProductType = int.Parse(dic["ProductType"].ToString());
-if(ProductType == 1) dic["ProductType"] = "在线办卡";
-if(ProductType == 3) dic["ProductType"] = "系统奖励";
-if(ProductType == 4) dic["ProductType"] = "灵动商城";
-if(ProductType == 5) dic["ProductType"] = "快钱Mpos";
-if(ProductType == 0) dic["ProductType"] = "";
+                int ProductType = int.Parse(dic["ProductType"].ToString());
+                if (ProductType == 1) dic["ProductType"] = "在线办卡";
+                if (ProductType == 3) dic["ProductType"] = "系统奖励";
+                if (ProductType == 4) dic["ProductType"] = "灵动商城";
+                if (ProductType == 5) dic["ProductType"] = "快钱Mpos";
+                if (ProductType == 0) dic["ProductType"] = "";
 
             }
 
@@ -319,7 +320,7 @@ if(ProductType == 0) dic["ProductType"] = "";
             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>();
-            
+
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "HelpProfitRebateDetail", "ExportExcel");
             return Json(result);

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

@@ -49,19 +49,6 @@
 <input class="layui-input" type="text" name="UserIdRealName" autocomplete="off">
 </div>
 </div>
-@{Dictionary<string, string> PosMerchantInfoDic = new MySystem.DictionaryClass().getPosMerchantInfoDic();}
-<div class="layui-inline">
-<label class="layui-form-label">商户</label>
-<div class="layui-input-inline">
-<select id="MerchantIdSelect" name="MerchantIdSelect" lay-search="">
-<option value="">全部...</option>
-@foreach (string key in PosMerchantInfoDic.Keys)
-{
-<option value="@key">@PosMerchantInfoDic[key]</option>
-}
-</select>
-</div>
-</div>
 <div class="layui-inline">
 <label class="layui-form-label">商户编号</label>
 <div class="layui-input-inline">