添加音响数据和列表

Areas/Api/Controllers/Main/KqProductsController.cs

@@ -53,7 +53,7 @@ namespace MySystem.Areas.Api.Controllers.v1
         #endregion
 
 
-        #region 首页-客小爽产品-主界面产品数据
+        #region 首页-客小爽产品-主界面产品数据(码牌)
         // [Authorize]
         public JsonResult MainStatData(string value)
         {
@@ -71,12 +71,19 @@ namespace MySystem.Areas.Api.Controllers.v1
             Dictionary<string, object> Obj = new Dictionary<string, object>();
 
             Models.Main.UserMachineData MachineData = UserMachineDataDbconn.Instance.Get(UserId + "_0") ?? new Models.Main.UserMachineData();
+            Models.Main.UserMachineData MachineData2 = UserMachineDataDbconn.Instance.Get(UserId + "_1") ?? new Models.Main.UserMachineData();
             Dictionary<string, object> Machine = new Dictionary<string, object>();
+            Dictionary<string, object> Machine2 = new Dictionary<string, object>();
             Machine.Add("TotalMachineCount", MachineData.TotalMachineCount);  //总机具数
             Machine.Add("UnBindCount", MachineData.UnBindCount); //未绑定机具数
             Machine.Add("BindCount", MachineData.BindCount); //已绑定机具数
             Obj.Add("Machine", Machine); //机具管理数据
 
+            Machine2.Add("TotalMachineCount2", MachineData2.TotalMachineCount);  //总机具数
+            Machine2.Add("UnBindCount2", MachineData2.UnBindCount); //未绑定机具数
+            Machine2.Add("BindCount2", MachineData2.BindCount); //已绑定机具数
+            Obj.Add("Machine", Machine2); //机具管理数据
+
             Dictionary<string, object> Profit = new Dictionary<string, object>();
             Profit.Add("TradeProfit", MachineData.TradeProfit); //交易分润
             Profit.Add("ActProfit", MachineData.ActProfit); //激活奖励

Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -452,6 +452,47 @@ namespace MySystem.Areas.Api.Controllers.v1
         #endregion
 
 
+
+        #region 创客-首页-我的商户-商户详情-音响
+        // [Authorize]
+        public JsonResult QrCodeList2(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            int TotalCount = 0;
+            List<Dictionary<string, object>> dataList = QrCodeList2Do(value, out TotalCount);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = TotalCount });
+        }
+        public List<Dictionary<string, object>> QrCodeList2Do(string value, out int TotalCount)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
+            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<Models.Main1.MachineForQrCode> query = main1db.MachineForQrCode.Where(m => m.MerchantId == MerchantId && m.MachineSnNo == m.SnNo).OrderByDescending(m => m.MerchantId);
+            TotalCount = query.Count();
+            if (PageNum == 1)
+            {
+                query = query.Take(PageSize);
+            }
+            else
+            {
+                int skipNum = PageSize * (PageNum - 1);
+                query = query.Skip(skipNum).Take(PageSize);
+            }
+            foreach (Models.Main1.MachineForQrCode item in query.ToList())
+            {
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("SnNo", item.SnNo); //sn
+                curData.Add("TradeAmount", QrCodeTradeStat.Instance.Amount(item.SnNo).ToString("f2"));  
+                dataList.Add(curData);
+            }
+            return dataList;
+        }
+        #endregion
+
+
         #region 首页-我的商户-商户搜索
         // [Authorize]
         public JsonResult MerchantSearch(string value)