暂存

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -649,7 +649,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportExcel(MerchantDepositReturns data, string CreateDateData, string UpdateDateData, string MerchantName, string PosSn, string PayKindSelect, string BankNameSelect, string StatusSelect)
+        public JsonResult ExportExcel(MerchantDepositReturns data, string CreateDateData, string UpdateDateData, string MerchantName, string PosSn, string PayKindSelect, string BankNameSelect, string StatusSelect, string BrandId)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -675,6 +675,19 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and BankName=" + BankNameSelect;
             }
+            //品牌
+            if (!string.IsNullOrEmpty(BrandId))
+            {
+                int brandId = int.Parse(BrandId);
+                var merchantIds = "";
+                var posMerchantInfo = db.PosMerchantInfo.Where(m => m.Status > -1 && m.BrandId == brandId && m.StandardMonths == 10).ToList();
+                foreach (var item in posMerchantInfo)
+                {
+                    merchantIds += item.Id + ",";
+                }
+                merchantIds = merchantIds.TrimEnd(',');
+                condition += " and MerchantId In(" + merchantIds + ")";
+            }
             //创建时间
             if (!string.IsNullOrEmpty(CreateDateData))
             {
@@ -792,7 +805,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportsExcel(MerchantDepositReturns data, string CreateDateData, string UpdateDateData, string MerchantName, string PosSn, string PayKindSelect, string BankNameSelect, string StatusSelect)
+        public JsonResult ExportsExcel(MerchantDepositReturns data, string CreateDateData, string UpdateDateData, string MerchantName, string PosSn, string PayKindSelect, string BankNameSelect, string StatusSelect, string BrandId)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -818,6 +831,19 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and BankName=" + BankNameSelect;
             }
+            //品牌
+            if (!string.IsNullOrEmpty(BrandId))
+            {
+                int brandId = int.Parse(BrandId);
+                var merchantIds = "";
+                var posMerchantInfo = db.PosMerchantInfo.Where(m => m.Status > -1 && m.BrandId == brandId && m.StandardMonths == 10).ToList();
+                foreach (var item in posMerchantInfo)
+                {
+                    merchantIds += item.Id + ",";
+                }
+                merchantIds = merchantIds.TrimEnd(',');
+                condition += " and MerchantId In(" + merchantIds + ")";
+            }
             //创建时间
             if (!string.IsNullOrEmpty(CreateDateData))
             {