补全

Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -40,9 +40,15 @@ namespace MySystem.Areas.Api.Controllers.v1
             string SearchKey = data.getItem("SearchKey").ToString();
             int Status = int.Parse(function.CheckInt(data.getItem("Status").ToString()));
             int UserId = int.Parse(function.CheckInt(data.getItem("UserId").ToString())); //所属创客
+            int BrandId = 0; //品牌(0 银联 1 好哒)
             int PageSize = int.Parse(function.CheckInt(data.getItem("PageSize").ToString()));
             int PageNum = int.Parse(function.CheckInt(data.getItem("PageNum").ToString()));
             StringBuilder condition = new StringBuilder();
+            if (!string.IsNullOrEmpty(data.getItem("BrandId").ToString()))
+            {
+                BrandId = int.Parse(function.CheckInt(data.getItem("BrandId").ToString())); //品牌(0 银联 1 好哒)
+            }
+            condition.Condition("BrandId", BrandId);
             condition.Condition("UserId", UserId);
             condition.Condition("Sort", 1);
             if (Status > 0)
@@ -254,11 +260,18 @@ namespace MySystem.Areas.Api.Controllers.v1
             int Kind = int.Parse(function.CheckInt(data.getItem("Kind").ToString()));
             string TradeSort = data.getItem("TradeSort").ToString(); //排序
             string DateSort = data.getItem("DateSort").ToString(); //排序
+            int BrandId = 0; //品牌(0 银联 1 好哒)
             int PageSize = int.Parse(function.CheckInt(data.getItem("PageSize").ToString()));
             int PageNum = int.Parse(function.CheckInt(data.getItem("PageNum").ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             IQueryable<MerchantInfo> query = maindb.MerchantInfo.Where(m => m.UserId == UserId && (m.Status == 2 || m.QueryCount == 2));
             DateTime today = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00");
+
+            if (!string.IsNullOrEmpty(data.getItem("BrandId").ToString()))
+            {
+                BrandId = int.Parse(function.CheckInt(data.getItem("BrandId").ToString())); //品牌(0 银联 1 好哒)
+            }
+            query = query.Where(m => m.BrandId == BrandId);
             if (!string.IsNullOrEmpty(SearchKey))
             {
                 query = query.Where(m => m.Name.Contains(SearchKey));
@@ -645,10 +658,17 @@ namespace MySystem.Areas.Api.Controllers.v1
         {
             JsonData data = JsonMapper.ToObject(value);
             int UserId = int.Parse(function.CheckInt(data["UserId"].ToString())); //所属创客
+            int BrandId = 0; //品牌(0 银联 1 好哒)
             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<MerchantInfo> query = maindb.MerchantInfo.Where(m => m.UserId == UserId && m.Sort == 0);
+
+            if (!string.IsNullOrEmpty(data["BrandId"].ToString()))
+            {
+                BrandId = int.Parse(function.CheckInt(data["BrandId"].ToString())); //品牌(0 银联 1 好哒)
+            }
+            query = query.Where(m => m.BrandId == BrandId);
             if (PageNum == 1)
             {
                 query = query.Take(PageSize);