修复音响绑定和已绑定列表

AppStart/Redis/Mysql/PosMachinesDbconn.cs

@@ -56,34 +56,34 @@ namespace MySystem
         #region 获取列表
         public List<int> GetList(int MerchantId, int pageNum = 1, int pageSize = 10)
         {
-            string key = "PosMachineList:" + MerchantId;
-            List<int> list = new List<int>();
-            if (RedisDbconn.Instance.Exists(key))
-            {
-                list = RedisDbconn.Instance.GetList<int>(key, pageNum, pageSize);
-                if (list.Count > 0)
-                {
-                    return list;
-                }
-            }
+            // string key = "PosMachineList:" + MerchantId;
+            // List<int> list = new List<int>();
+            // if (RedisDbconn.Instance.Exists(key))
+            // {
+            //     list = RedisDbconn.Instance.GetList<int>(key, pageNum, pageSize);
+            //     if (list.Count > 0)
+            //     {
+            //         return list;
+            //     }
+            // }
+            List<int> newlist = new List<int>();
             WebCMSEntities db = new WebCMSEntities();
             var mysqllist = db.PosMachines.Select(m => new { m.Id, m.BindMerchantId, m.DeviceKind }).Where(m => m.BindMerchantId == MerchantId && m.DeviceKind == "1").OrderByDescending(m => m.Id).ToList();
             if (mysqllist.Count > 0)
             {
-                List<int> newlist = new List<int>();
                 foreach (var sub in mysqllist)
                 {
                     newlist.Add(sub.Id);
                 }
-                RedisDbconn.Instance.Clear(key);
-                foreach (int sub in newlist)
-                {
-                    RedisDbconn.Instance.AddRightList(key, sub);
-                }
-                RedisDbconn.Instance.SetExpire(key, Library.function.get_Random(30, 60));
+                // RedisDbconn.Instance.Clear(key);
+                // foreach (int sub in newlist)
+                // {
+                //     RedisDbconn.Instance.AddRightList(key, sub);
+                // }
+                // RedisDbconn.Instance.SetExpire(key, Library.function.get_Random(30, 60));
             }
             db.Dispose();
-            return list;
+            return newlist;
         }
         #endregion
     }

Areas/Api/Controllers/v1/MainServer/MerchantInfoController.cs

@@ -364,7 +364,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
             int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            IQueryable<MachineForQrCode> query = maindb.MachineForQrCode.Where(m => m.MerchantId == MerchantId && m.MachineSnNo != m.SnNo && !string.IsNullOrEmpty(m.MachineSnNo)).OrderByDescending(m => m.MerchantId);
+            IQueryable<MachineForQrCode> query = maindb.MachineForQrCode.Where(m => m.MerchantId == MerchantId && m.DataId.EndsWith("_1") && m.MachineSnNo != m.SnNo && !string.IsNullOrEmpty(m.MachineSnNo)).OrderByDescending(m => m.MerchantId);
             TotalCount = query.Count();
             if (PageNum == 1)
             {

Areas/Api/Controllers/v1/MainServer/MerchantQrCodeController.cs

@@ -115,7 +115,6 @@ namespace MySystem.Areas.Api.Controllers.v1
             PosMachines machines = new PosMachinesService().Query(SnNo);
             MerchantInfo merchant = new MerchantInfoService().Query(MerchantId);
             int PosId = 0;
-            int Kind = 0;
             if (SnNo == MachineNo || string.IsNullOrEmpty(MachineNo))
             {
                 if (pos.Id == 0)
@@ -123,7 +122,6 @@ namespace MySystem.Areas.Api.Controllers.v1
                     return new AppResultJson() { Status = "-1", Info = "绑定失败" };
                 }
                 PosId = pos.Id;
-                Kind = 1;
             }
             else if (SnNo != MachineNo)
             {
@@ -132,7 +130,6 @@ namespace MySystem.Areas.Api.Controllers.v1
                     return new AppResultJson() { Status = "-1", Info = "绑定失败" };
                 }
                 PosId = machines.Id;
-                Kind = 2;
             }
             if (query.Id > 0)
             {
@@ -151,7 +148,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             }
             else
             {
-                string DataId = PosId + "_" + Kind;
+                string DataId = PosId + "_1";
                 MachineForQrCode forQrCode = maindb.MachineForQrCode.FirstOrDefault(m => m.DataId == DataId);
                 if (forQrCode == null)
                 {

Areas/Api/Controllers/v1/MainServer/PosMachinesController.cs

@@ -529,7 +529,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 PageSize = 100000;
             }
-            IQueryable<PosMachines> query = maindb.PosMachines.Where(m => m.Status > -1 && m.BuyUserId == UserId && m.BindingState == 1);
+            IQueryable<PosMachines> query = maindb.PosMachines.Where(m => m.Status > -1 && m.BuyUserId == UserId && m.BindingState == 1 && m.DeviceKind == "1");
             if (!string.IsNullOrEmpty(SnNo))
             {
                 query = query.Where(m => m.PosSn == SnNo);