添加直连码牌标记

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

@@ -298,7 +298,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 PageSize = 100000;
             }
-            IQueryable<PosMachinesTwo> query = maindb.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId == UserId && m.BindingState == 1);
+            IQueryable<PosMachinesTwo> query = maindb.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId == UserId && m.BindingState == 1 && m.OpId != 2);
             if (!string.IsNullOrEmpty(SnNo))
             {
                 query = query.Where(m => m.PosSn == SnNo);
@@ -332,7 +332,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 curData.Add("Id", subdata.Id); //Id
                 decimal Deposit = 299;
                 if (BrandId == 6)
-                { 
+                {
                     Deposit = 249;
                 }
                 if (!string.IsNullOrEmpty(subdata.PrizeParams))
@@ -342,7 +342,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 curData.Add("Deposit", Deposit);
                 MerchantAddInfo merchant = maindb.MerchantAddInfo.FirstOrDefault(m => m.Id == subdata.BindMerchantId) ?? new MerchantAddInfo();
                 curData.Add("BindedMerchant", merchant.CertMerchantName);
-                curData.Add("IsLeader",IsLeader);
+                curData.Add("IsLeader", IsLeader);
                 dataList.Add(curData);
             }
             return dataList;
@@ -408,7 +408,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 curData.Add("FromStore", store.StoreName); //来自仓库
                 decimal Deposit = 299;
                 if (BrandId == 6)
-                { 
+                {
                     Deposit = 249;
                 }
                 if (!string.IsNullOrEmpty(subdata.PrizeParams))
@@ -416,7 +416,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                     Deposit = decimal.Parse(function.CheckNum(subdata.PrizeParams));
                 }
                 curData.Add("Deposit", Deposit);
-                curData.Add("IsLeader",IsLeader);
+                curData.Add("IsLeader", IsLeader);
                 dataList.Add(curData);
             }
             return dataList;
@@ -483,14 +483,14 @@ namespace MySystem.Areas.Api.Controllers.v1
                     curData.Add("ActDays", ts.TotalDays.ToString("f0")); //活动剩余天数
                 }
                 else
-                { 
+                {
                     curData.Add("ActDays", 0); //活动剩余天数
                 }
                 curData.Add("CreateDate", subdata.CreateDate.Value.ToString("yyyy-MM-dd")); //机具初始日期
                 curData.Add("EndDate", subdata.RecycEndDate == null ? "" : subdata.RecycEndDate.Value.ToString("yyyy-MM-dd")); //截止日期
                 decimal Deposit = 299;
                 if (BrandId == 6)
-                { 
+                {
                     Deposit = 249;
                 }
                 if (!string.IsNullOrEmpty(subdata.PrizeParams))
@@ -498,7 +498,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                     Deposit = decimal.Parse(function.CheckNum(subdata.PrizeParams));
                 }
                 curData.Add("Deposit", Deposit);
-                curData.Add("IsLeader",IsLeader);
+                curData.Add("IsLeader", IsLeader);
                 dataList.Add(curData);
             }
             return dataList;