修复发送个人消息bug

Areas/Admin/Controllers/BsServer/BaseController.cs

@@ -40,6 +40,9 @@ namespace MySystem.Areas.Admin.Controllers
         public string JwtSecret = Library.ConfigurationManager.AppSettings["JwtSecret"].ToString();
         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;

Areas/Admin/Controllers/BsServer/MsgPersonalController.cs

@@ -139,7 +139,7 @@ namespace MySystem.Areas.Admin.Controllers
             string[] MakerCodeList = MakerCode.Split(',');
             foreach (string code in MakerCodeList)
             {
-                Models.UserForMakerCode codeData = RedisDbconn.Instance.Get<Models.UserForMakerCode>("UserForMakerCode:" + code) ?? new Models.UserForMakerCode();
+                Models.UserForMakerCode codeData = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == code) ?? new Models.UserForMakerCode();
                 if (AddKind == 0)
                 {
                     Dictionary<string, object> Fields = new Dictionary<string, object>();

Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -469,7 +469,7 @@ namespace MySystem.Areas.Admin.Controllers
             List<int> upposIds = new List<int>();
             string userIds = "";
             DateTime check = DateTime.Now.AddDays(-120);
-            List<PosMachinesTwo> poslist = db.PosMachinesTwo.Where(m => m.Status > -1 && m.BindingState == 1 && m.UpFeeFlag == 1 && m.DownFeeFlag == 0 && m.BindingTime <= check && m.SeoDescription != "设置成功").ToList();
+            List<PosMachinesTwo> poslist = db.PosMachinesTwo.Where(m => m.Status > -1 && m.BindingState == 1 && m.UpFeeFlag == 1 && m.DownFeeFlag == 0 && m.BindingTime <= check && m.SeoDescription != "设置成功").ToList();//18503
             foreach (PosMachinesTwo pos in poslist)
             {
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
@@ -482,7 +482,7 @@ namespace MySystem.Areas.Admin.Controllers
                     userIds += pos.BuyUserId + ",";
                 }
 
-                if (pos.BrandId == 1 || pos.BrandId == 3 || pos.BrandId == 2 || pos.BrandId == 4 || pos.BrandId == 5 || pos.BrandId == 6)
+                if (pos.BrandId == 1 || pos.BrandId == 3 || pos.BrandId == 2 || pos.BrandId == 4 || pos.BrandId == 5 || pos.BrandId == 6 || pos.BrandId == 7)
                 {
                     // PosId:机具Id
                     // Kind:1或2，1为费率0.63，2为费率0.6
@@ -490,10 +490,10 @@ namespace MySystem.Areas.Admin.Controllers
                     string info = "{\"RecordId\":\"\",\"PosId\":\"" + pos.Id + "\",\"Fee\": \"" + 0.63 + "\",\"Kind\": \"" + 1 + "\",\"OpMan\": \"" + SysUserName + "\"}";
                     RedisDbconn.Instance.AddList("SetDepositPostQueue", info);
                 }
-                else
-                {
-                    upposIds.Add(pos.Id);
-                }
+                // else
+                // {
+                //     upposIds.Add(pos.Id);
+                // }
                 new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("PosMachinesTwo", Fields, pos.Id);
 
             }

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 运营中心机具申请记录列表

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/Views/MainServer/PosMachinesTwoChange/Index.cshtml

@@ -119,8 +119,7 @@
                         </div>
                     </div>
                     @{
-                        Dictionary<string, string> ProfitObjectsActivesDic = new
-                    MySystem.DictionaryClass().getKqProductBrandDic();
+                        Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();
                     }
                     <div class="layui-inline">
                         <label class="layui-form-label">品牌</label>

wwwroot/layuiadmin/modules_main/PosMachinesTwoChange_Admin.js

@@ -458,28 +458,33 @@ layui.config({
             // if (data.length < 1) {
             //     parent.layer.msg("请选择要设置调升费率的项");
             // } else {
-                var ids = "0";
-                $.each(data, function (index, value) {
-                    ids += data[index].Id + ",";
-                });
-                ids = ids.substring(0, ids.length - 1);
-                var index = layer.confirm('确定要调升吗？', function (index) {
+                // var ids = "0";
+                // $.each(data, function (index, value) {
+                //     ids += data[index].Id + ",";
+                // });
+                // ids = ids.substring(0, ids.length - 1);
+                var confirmindex = layer.confirm('确定要调升吗？', function (index) {
+                    var layerindex = layer.load(1, {
+                        shade: [0.5, '#000']
+                    });
                     $.ajax({
                         type: "POST",
                         url: "/Admin/PosMachinesTwoChange/BatchSetting?r=" + Math.random(1),
-                        data: "Id=" + ids,
                         dataType: "text",
                         success: function (data) {
-                            layer.close(index);
+                            layer.close(confirmindex);
+                            layer.close(layerindex);
                             if (data == "success") {
                                 table.reload('LAY-list-manage');
-                            }
-                            else if (data.indexOf("Warning") == 0) {
+                                layer.msg('提交成功');
+                            } else if (data.indexOf("Warning") == 0) {
                                 var datalist = data.split('|');
-                                layer.alert(datalist[1], { time: 20000 }, function () {
+                                layer.alert(datalist[1], {
+                                    time: 20000
+                                }, function () {
                                     window.location.reload();
-                                });}
-                            else {
+                                });
+                            } else {
                                 layer.msg(data);
                             }
                         }