Merge branch 'DuGuYang' into develop

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))
             {

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -168,6 +168,7 @@ namespace MySystem.Areas.Admin.Controllers
 
         #region 根据条件查询人工已退商户列表
 
+
         /// <summary>
         /// 人工已退商户列表
         /// </summary>
@@ -266,7 +267,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string SeoKeyword = "0";
                 if (!string.IsNullOrEmpty(pos.SeoKeyword))
                 {
-                    if (pos.SeoKeyword.Length > 3)
+                    if (pos.BrandId != 2 && pos.BrandId != 7)
                     {
                         SeoKeyword = (decimal.Parse(pos.SeoKeyword) / 100).ToString();
                     }
@@ -302,7 +303,7 @@ namespace MySystem.Areas.Admin.Controllers
                     var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == KqSnNo) ?? new PosMachinesTwo();
                     if (!string.IsNullOrEmpty(pos.SeoKeyword))
                     {
-                        if (pos.SeoKeyword.Length > 3)
+                        if (pos.BrandId != 2 && pos.BrandId != 7)
                         {
                             ReturnAmounts += decimal.Parse(pos.SeoKeyword) / 100;
                         }

Areas/Admin/Views/MainServer/SysRechargeRecord/Index.cshtml

@@ -99,9 +99,9 @@
                         </div>
                     </div>
                     <div class="layui-inline">
-                        <label class="layui-form-label">奖励时间</label>
+                        <label class="layui-form-label">导入时间</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" readonly name="BizTimeData" id="BizTime" placeholder="奖励时间"
+                            <input class="layui-input" type="text" readonly name="BizTimeData" id="BizTime" placeholder="导入时间"
                             autocomplete="off">
                         </div>
                     </div>

wwwroot/layuiadmin/modules_main/SysRechargeRecord_Admin.js

@@ -127,7 +127,7 @@ layui.config({
             , { field: 'Amount', width: 200, title: '奖励金额(元)', sort: true }
             , { field: 'Status', width: 200, title: '状态', sort: true }
             , { field: 'SeoDescription', width: 200, title: '备注', sort: true }
-            , { field: 'BizTime', width: 200, title: '奖励时间', sort: true }
+            , { field: 'BizTime', width: 200, title: '导入时间', sort: true }
             , { field: 'SyncStatus', width: 200, title: '同步状态', sort: true }
             , { field: 'CreateMan', width: 200, title: '操作员', sort: true }
         ]]