Merge branch 'feature-dgy-后台新功能批量处理' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1155,7 +1155,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         [HttpPost]
-        public string CancelMerAgentDo(string MakerCode, string PosSn, string MerNo, int IsSend = 0)
+        public string CancelMerAgentDo(string MakerCode, string PosSn, int IsSend = 0)
         {
             if (string.IsNullOrEmpty(MakerCode))
             {
@@ -1165,10 +1165,6 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "请输入机具SN";
             }
-            if (string.IsNullOrEmpty(MerNo))
-            {
-                return "请输入商户编号";
-            }
             PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);
             KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);
             if (pos == null)
@@ -1180,11 +1176,8 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "创客编号不存在";
             }
-            PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == MerNo);
-            if (merchant == null)
-            {
-                return "商户编号不存在";
-            }
+            PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.KqSnNo == PosSn);
+            
             else if (merchant.MerUserType == 1 && merchant.UserId == user.Id)
             {
                 pos.UserId = pos.BuyUserId;
@@ -1202,7 +1195,7 @@ namespace MySystem.Areas.Admin.Controllers
                     BindDate = pos.BindingTime,
                     ActStatus = (ulong)pos.ActivationState,
                     BindStatus = (ulong)pos.BindingState,
-                    MerNo = MerNo,
+                    MerNo = merchant.KqMerNo,
                     PosSn = pos.PosSn,
                     Note = "后台取消商户型创客",
                     ToUserId = user.Id,

Areas/Admin/Views/MainServer/SysTools/CancelMerAgent.cshtml

@@ -45,13 +45,6 @@
                                             lay-verify="required|" autocomplete="off" placeholder="请输入机具SN">
                                     </div>
                                 </div>
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label">商户编号</label>
-                                    <div class="layui-input-inline">
-                                        <input class="layui-input" type="text" id="MerNo" name="MerNo" maxlength="50"
-                                            lay-verify="required|" autocomplete="off" placeholder="请输入商户编号">
-                                    </div>
-                                </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">是否推送消息</label>
                                     <div class="layui-input-block">