解绑删除商户

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1534,6 +1534,11 @@ namespace MySystem.Areas.Admin.Controllers
             }
             if (forMerNo != null)
             {
+                PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
+                if(merchant != null)
+                {
+                    db.PosMerchantInfo.Remove(merchant);
+                }
                 db.MachineForMerNo.Remove(forMerNo);
                 db.SaveChanges();
             }

obj/release/netcoreapp3.0/MySystem.RazorCoreGenerate.cache

@@ -1 +1 @@
-17f1c218e5f88ccef9c12aaf31c2a428b70bc9bb
+335242f1e6916e5ed10a6a869889926171466480

obj/release/netcoreapp3.0/MySystem.csproj.FileListAbsolute.txt

@@ -591,3 +591,9 @@
 /Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/obj/release/netcoreapp3.0/Razor/Areas/Admin/Views/MainServer/PosCoupons/SJQ.cshtml.g.cs
 /Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/obj/release/netcoreapp3.0/Razor/Areas/Admin/Views/MainServer/SysTools/CancelMerAgent.cshtml.g.cs
 /Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/obj/release/netcoreapp3.0/Razor/Areas/Admin/Views/MainServer/UserCashRecord/HelpProfitIndex.cshtml.g.cs
+/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/obj/release/netcoreapp3.0/Razor/Areas/Admin/Views/MainServer/SchoolMakerStudy/Add.cshtml.g.cs
+/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/obj/release/netcoreapp3.0/Razor/Areas/Admin/Views/MainServer/SchoolMakerStudy/Edit.cshtml.g.cs
+/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/obj/release/netcoreapp3.0/Razor/Areas/Admin/Views/MainServer/SchoolMakerStudy/Index.cshtml.g.cs
+/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/obj/release/netcoreapp3.0/Razor/Areas/Admin/Views/MainServer/SchoolMorningMeet/Add.cshtml.g.cs
+/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/obj/release/netcoreapp3.0/Razor/Areas/Admin/Views/MainServer/SchoolMorningMeet/Edit.cshtml.g.cs
+/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/obj/release/netcoreapp3.0/Razor/Areas/Admin/Views/MainServer/SchoolMorningMeet/Index.cshtml.g.cs

obj/release/netcoreapp3.0/Razor/Areas/Admin/Views/MainServer/UserCashRecord/HelpProfitIndex.cshtml.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/Areas/Admin/Views/MainServer/UserCashRecord/HelpProfitIndex.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "528efca9eb6bfc611b3a285998d95be2ecbe8bb5"
+#pragma checksum "/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/Areas/Admin/Views/MainServer/UserCashRecord/HelpProfitIndex.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "f0a37a23449ad5da1ad29b5c3d67865fefdee661"
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.Areas_Admin_Views_MainServer_UserCashRecord_HelpProfitIndex), @"mvc.1.0.view", @"/Areas/Admin/Views/MainServer/UserCashRecord/HelpProfitIndex.cshtml")]
@@ -12,7 +12,7 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
-    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"528efca9eb6bfc611b3a285998d95be2ecbe8bb5", @"/Areas/Admin/Views/MainServer/UserCashRecord/HelpProfitIndex.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"f0a37a23449ad5da1ad29b5c3d67865fefdee661", @"/Areas/Admin/Views/MainServer/UserCashRecord/HelpProfitIndex.cshtml")]
     public class Areas_Admin_Views_MainServer_UserCashRecord_HelpProfitIndex : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
     {
         #line hidden
@@ -51,7 +51,7 @@ namespace AspNetCore
 #line hidden
 #nullable disable
             WriteLiteral("<!DOCTYPE html>\n<html>\n\n");
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("head", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "528efca9eb6bfc611b3a285998d95be2ecbe8bb53272", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("head", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "f0a37a23449ad5da1ad29b5c3d67865fefdee6613272", async() => {
                 WriteLiteral(@"
     <meta charset=""utf-8"">
     <title>盟主提现记录</title>
@@ -96,7 +96,7 @@ namespace AspNetCore
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
             WriteLiteral("\n\n");
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("body", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "528efca9eb6bfc611b3a285998d95be2ecbe8bb55152", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("body", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "f0a37a23449ad5da1ad29b5c3d67865fefdee6615152", async() => {
                 WriteLiteral(@"
     <div class=""layui-fluid"">
         <div class=""layui-card"">
@@ -179,6 +179,22 @@ namespace AspNetCore
 #line 104 "/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/Areas/Admin/Views/MainServer/UserCashRecord/HelpProfitIndex.cshtml"
                         }
 
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 105 "/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/Areas/Admin/Views/MainServer/UserCashRecord/HelpProfitIndex.cshtml"
+                         if (RightInfo.Contains("," + right + "_cash,"))
+                        {
+
+#line default
+#line hidden
+#nullable disable
+                WriteLiteral("                            <button class=\"layui-btn\" data-type=\"Cash\"><i\n                                class=\"layui-icon layui-icon-up layuiadmin-button-btn\"></i>提交到代付平台</button>\n");
+#nullable restore
+#line 109 "/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/Areas/Admin/Views/MainServer/UserCashRecord/HelpProfitIndex.cshtml"
+                        }
+
 #line default
 #line hidden
 #nullable disable
@@ -215,11 +231,11 @@ namespace AspNetCore
 
     <script src=""/layuiadmin/layui/layui.js""></script>
     <script");
-                BeginWriteAttribute("src", " src=\"", 6326, "\"", 6427, 2);
-                WriteAttributeValue("", 6332, "/layuiadmin/modules_main/UserCashHelpRecord_Admin.js?r=", 6332, 55, true);
+                BeginWriteAttribute("src", " src=\"", 6633, "\"", 6734, 2);
+                WriteAttributeValue("", 6639, "/layuiadmin/modules_main/UserCashHelpRecord_Admin.js?r=", 6639, 55, true);
 #nullable restore
-#line 136 "/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/Areas/Admin/Views/MainServer/UserCashRecord/HelpProfitIndex.cshtml"
-WriteAttributeValue("", 6387, DateTime.Now.ToString("yyyyMMddHHmmss"), 6387, 40, false);
+#line 141 "/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/Areas/Admin/Views/MainServer/UserCashRecord/HelpProfitIndex.cshtml"
+WriteAttributeValue("", 6694, DateTime.Now.ToString("yyyyMMddHHmmss"), 6694, 40, false);
 
 #line default
 #line hidden

obj/release/netcoreapp3.0/Razor/Areas/Admin/Views/MainServer/UserCashRecord/LeaderIndex.cshtml.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/Areas/Admin/Views/MainServer/UserCashRecord/LeaderIndex.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "cf15de865b6f8c86d6e2dfd22cf02383d738bef0"
+#pragma checksum "/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/Areas/Admin/Views/MainServer/UserCashRecord/LeaderIndex.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "d7e4173f3b4b403ac3e2188085cd1953feb6ffb6"
 // <auto-generated/>
 #pragma warning disable 1591
 [assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.Areas_Admin_Views_MainServer_UserCashRecord_LeaderIndex), @"mvc.1.0.view", @"/Areas/Admin/Views/MainServer/UserCashRecord/LeaderIndex.cshtml")]
@@ -12,7 +12,7 @@ namespace AspNetCore
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.AspNetCore.Mvc.Rendering;
     using Microsoft.AspNetCore.Mvc.ViewFeatures;
-    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"cf15de865b6f8c86d6e2dfd22cf02383d738bef0", @"/Areas/Admin/Views/MainServer/UserCashRecord/LeaderIndex.cshtml")]
+    [global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"SHA1", @"d7e4173f3b4b403ac3e2188085cd1953feb6ffb6", @"/Areas/Admin/Views/MainServer/UserCashRecord/LeaderIndex.cshtml")]
     public class Areas_Admin_Views_MainServer_UserCashRecord_LeaderIndex : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
     {
         #line hidden
@@ -51,7 +51,7 @@ namespace AspNetCore
 #line hidden
 #nullable disable
             WriteLiteral("<!DOCTYPE html>\r\n<html>\r\n\r\n");
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("head", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "cf15de865b6f8c86d6e2dfd22cf02383d738bef03258", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("head", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "d7e4173f3b4b403ac3e2188085cd1953feb6ffb63258", async() => {
                 WriteLiteral(@"
     <meta charset=""utf-8"">
     <title>盟主提现记录</title>
@@ -96,7 +96,7 @@ namespace AspNetCore
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
             WriteLiteral("\r\n\r\n");
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("body", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "cf15de865b6f8c86d6e2dfd22cf02383d738bef05173", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("body", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "d7e4173f3b4b403ac3e2188085cd1953feb6ffb65173", async() => {
                 WriteLiteral(@"
     <div class=""layui-fluid"">
         <div class=""layui-card"">
@@ -151,22 +151,6 @@ namespace AspNetCore
            ");
                 WriteLiteral("             <button class=\"layui-btn\" lay-submit lay-filter=\"LAY-list-front-searchall\">\r\n                            <i class=\"layui-icon layui-icon-list layuiadmin-button-btn\"></i>全部\r\n                        </button>\r\n");
 #nullable restore
-#line 90 "/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/Areas/Admin/Views/MainServer/UserCashRecord/LeaderIndex.cshtml"
-                         if (RightInfo.Contains("," + right + "_reduce,"))
-                        {
-
-#line default
-#line hidden
-#nullable disable
-                WriteLiteral("                            <button class=\"layui-btn layui-btn-normal layui-btn-xs\" lay-event=\"reduce\"><i\r\n                                class=\"layui-icon layui-icon-edit\"></i>驳回</button>\r\n");
-#nullable restore
-#line 94 "/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/Areas/Admin/Views/MainServer/UserCashRecord/LeaderIndex.cshtml"
-                        }
-
-#line default
-#line hidden
-#nullable disable
-#nullable restore
 #line 95 "/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/Areas/Admin/Views/MainServer/UserCashRecord/LeaderIndex.cshtml"
                          if (RightInfo.Contains("," + right + "_export,"))
                         {
@@ -231,11 +215,11 @@ namespace AspNetCore
 
     <script src=""/layuiadmin/layui/layui.js""></script>
     <script");
-                BeginWriteAttribute("src", " src=\"", 6455, "\"", 6558, 2);
-                WriteAttributeValue("", 6461, "/layuiadmin/modules_main/UserCashLeaderRecord_Admin.js?r=", 6461, 57, true);
+                BeginWriteAttribute("src", " src=\"", 6461, "\"", 6564, 2);
+                WriteAttributeValue("", 6467, "/layuiadmin/modules_main/UserCashLeaderRecord_Admin.js?r=", 6467, 57, true);
 #nullable restore
 #line 136 "/Users/Shared/Previously Relocated Items/Security/MyDisk/我的/项目/myprogram_vs2019/KeXiaoShuang/BsServerSub/Areas/Admin/Views/MainServer/UserCashRecord/LeaderIndex.cshtml"
-WriteAttributeValue("", 6518, DateTime.Now.ToString("yyyyMMddHHmmss"), 6518, 40, false);
+WriteAttributeValue("", 6524, DateTime.Now.ToString("yyyyMMddHHmmss"), 6524, 40, false);
 
 #line default
 #line hidden