Merge branch 'feature-dgy-商户退押导入结果调整' into feature-dgy-后台测试

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)

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -592,7 +592,7 @@ namespace MySystem.Areas.Admin.Controllers
         public void AddAct(int posid = 0)
         {
             WebCMSEntities db = new WebCMSEntities();
-            PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.ActivationState == 1 && !string.IsNullOrEmpty(m.SeoKeyword) && m.Id == posid);
+            PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.ActivationState == 1 && m.Id == posid);
             if (pos != null)
             {
                 PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
@@ -651,7 +651,7 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             prizes.Add(50);
                         }
-                        else if ((pos.BrandId == 10 || pos.BrandId == 11) && pos.IsFirst == 1 && ActPrize == 0) //联动首台无押金机返50
+                        else if ((pos.BrandId == 10 || pos.BrandId == 11) && pos.IsFirst == 1 && ActPrize == 0 && (DateTime.Now < DateTime.Parse("2023-05-01 00:00:00") || SysUserName == "admin")) //联动首台无押金机返50
                         {
                             prizes.Add(50);
                         }
@@ -1099,7 +1099,7 @@ namespace MySystem.Areas.Admin.Controllers
             if (openreward.Id > 0)
             {
                 Users user = db.Users.FirstOrDefault(m => m.Id == openreward.UserId) ?? new Users();
-                OpenUser20 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "发放时间：" + openreward.CreateDate.Value.ToString("yyyy-MM-dd hh:mm:ss");
+                OpenUser20 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "发放时间：" + openreward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             }
             openreward = OpenRewardDetail.FirstOrDefault(m => m.CreditRewardAmount == 10) ?? new OpenRewardDetail();
             if (openreward.Id > 0)
@@ -2315,8 +2315,8 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                var stattime = pos.RecycStartDate == null ? "" : pos.RecycStartDate.Value.ToString("yyyy-MM-dd hh:mm:ss");
-                var endtime = pos.RecycEndDate == null ? "" : pos.RecycEndDate.Value.ToString("yyyy-MM-dd hh:mm:ss");
+                var stattime = pos.RecycStartDate == null ? "" : pos.RecycStartDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                var endtime = pos.RecycEndDate == null ? "" : pos.RecycEndDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
                 result += "循环开始时间：" + stattime + "\n";
                 result += "循环结束时间：" + endtime + "\n";
                 result += "来源机具/券：" + pos.SourcePosSn + "\n";
@@ -4510,8 +4510,8 @@ namespace MySystem.Areas.Admin.Controllers
                         IsOk = "未达标";
                     }
                     result += IsOk + "\n";
-                    result += "开机时间：" + DateTime.Parse(pos.BindingTime.ToString()).ToString("yyyy-MM-dd hh:mm:sss") + "\n";
-                    result += "激活时间：" + DateTime.Parse(pos.ActivationTime.ToString()).ToString("yyyy-MM-dd hh:mm:sss") + "\n";
+                    result += "开机时间：" + DateTime.Parse(pos.BindingTime.ToString()).ToString("yyyy-MM-dd HH:mm:ss") + "\n";
+                    result += "激活时间：" + DateTime.Parse(pos.ActivationTime.ToString()).ToString("yyyy-MM-dd HH:mm:ss") + "\n";
                     result += "商户姓名：" + mer.MerRealName + "\n";
                     result += "明细：\n";
                     for (int i = 0; i < 12; i++)