Merge branch 'feature-dgy-商户退押导入结果调整' into DuGuYang

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -520,13 +520,19 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 JsonData dr = list[i];
                 string itemJson = dr.ToJson();
-                string PosSn = itemJson.Contains("\"A\"") ? dr["A"].ToString() : "";// 退押机具Sn
+                string PosSn = itemJson.Contains("\"A\"") ? dr["A"].ToString().Replace("机具SN：","") : "";// 退押机具Sn
                 string Statuss = itemJson.Contains("\"B\"") ? dr["B"].ToString() : ""; // 结果
                 string SeoDescription = itemJson.Contains("\"C\"") ? dr["C"].ToString() : "";// 备注
-                int Status = int.Parse(Statuss);
-                // string PosSn = dr[0].ToString(); // 退押机具Sn
-                // int Status = int.Parse(dr[1].ToString()); // 结果
-                // string SeoDescription = dr[2].ToString(); // 备注
+                // int Status = int.Parse(Statuss);
+                int Status = 0;
+                if (Statuss == "SUCCESS")//成功
+                {
+                    Status = 1;
+                }
+                if (Statuss == "FAIL")//失败
+                {
+                    Status = 2;
+                }
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn) ?? new PosMachinesTwo();
                 var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.MerchantId == pos.BindMerchantId && m.Status == 0) ?? new MerchantDepositReturns();
                 if (merchantDepositReturns.Id == 0)
@@ -567,13 +573,19 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 JsonData dr = list[i];
                 string itemJson = dr.ToJson();
-                string PosSn = itemJson.Contains("\"A\"") ? dr["A"].ToString() : "";// 退押机具Sn
+                string PosSn = itemJson.Contains("\"A\"") ? dr["A"].ToString().Replace("机具SN：","") : "";// 退押机具Sn
                 string Statuss = itemJson.Contains("\"B\"") ? dr["B"].ToString() : ""; // 结果
                 string SeoDescription = itemJson.Contains("\"C\"") ? dr["C"].ToString() : "";// 备注
-                int Status = int.Parse(Statuss);
-                // string PosSn = dr[0].ToString(); // 退押机具Sn
-                // int Status = int.Parse(dr[1].ToString()); // 结果
-                // string SeoDescription = dr[2].ToString(); // 备注
+                // int Status = int.Parse(Statuss);
+                int Status = 0;
+                if (Statuss == "SUCCESS")//成功
+                {
+                    Status = 1;
+                }
+                if (Statuss == "FAIL")//失败
+                {
+                    Status = 2;
+                }
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn) ?? new PosMachinesTwo();
                 var merchantDepositReturns = db.MerchantDepositReturns.FirstOrDefault(m => m.MerchantId == pos.BindMerchantId && m.Status == 0) ?? new MerchantDepositReturns();
                 if (merchantDepositReturns.Id == 0)
@@ -637,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>();
@@ -663,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))
             {
@@ -780,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>();
@@ -806,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))
             {