绑定和展示收款码的调整

Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -481,7 +481,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             int PageSize = int.Parse(function.CheckInt(data.getItem("PageSize").ToString()));
             int PageNum = int.Parse(function.CheckInt(data.getItem("PageNum").ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            IQueryable<Models.Main1.MachineForQrCode> query = main1db.MachineForQrCode.Where(m => m.MerchantId == MerchantId && m.MachineSnNo != m.SnNo).OrderByDescending(m => m.MerchantId);
+            IQueryable<Models.Main1.MachineForQrCode> query = main1db.MachineForQrCode.Where(m => m.MerchantId == MerchantId && m.MachineSnNo != m.SnNo && !string.IsNullOrEmpty(m.MachineSnNo)).OrderByDescending(m => m.MerchantId);
             TotalCount = query.Count();
             if (PageNum == 1)
             {

Areas/Api/Controllers/Main/MerchantQrCodeController.cs

@@ -105,7 +105,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             Models.Main.MerchantInfo merchant = MerchantInfoService.Query(MerchantId);
             int PosId = 0;
             int Kind = 0;
-            if (SnNo == MachineNo)
+            if (SnNo == MachineNo || string.IsNullOrEmpty(MachineNo))
             {
                 if (pos.Id == 0)
                 {
@@ -139,36 +139,38 @@ namespace MySystem.Areas.Api.Controllers.v1
                 }
             }
             Dictionary<string, object> fields = new Dictionary<string, object>();
-            if (SnNo == MachineNo)
+            if (SnNo == MachineNo || string.IsNullOrEmpty(MachineNo))
             {
                 fields.Add("MerchantId", MerchantId);
                 fields.Add("SnNo", SnNo);
                 fields.Add("QueryCount", 2);
                 MerchantQrCodeService.Add(fields);
             }
-
-            string DataId = PosId + "_" + Kind;
-            Models.Main1.MachineForQrCode forQrCode = main1db.MachineForQrCode.FirstOrDefault(m => m.DataId == DataId);
-            if (forQrCode == null)
-            {
-                forQrCode = main1db.MachineForQrCode.Add(new Models.Main1.MachineForQrCode()
-                {
-                    DataId = DataId,
-                    SnNo = SnNo,
-                    MachineSnNo = MachineNo,
-                    BindDate = DateTime.Now,
-                    MerchantId = MerchantId,
-                }).Entity;
-            }
             else
             {
-                forQrCode.SnNo = SnNo;
-                forQrCode.MachineSnNo = MachineNo;
-                forQrCode.BindDate = DateTime.Now;
-                forQrCode.MerchantId = MerchantId;
+                string DataId = PosId + "_" + Kind;
+                Models.Main1.MachineForQrCode forQrCode = main1db.MachineForQrCode.FirstOrDefault(m => m.DataId == DataId);
+                if (forQrCode == null)
+                {
+                    forQrCode = main1db.MachineForQrCode.Add(new Models.Main1.MachineForQrCode()
+                    {
+                        DataId = DataId,
+                        SnNo = SnNo,
+                        MachineSnNo = MachineNo,
+                        BindDate = DateTime.Now,
+                        MerchantId = MerchantId,
+                    }).Entity;
+                }
+                else
+                {
+                    forQrCode.SnNo = SnNo;
+                    forQrCode.MachineSnNo = MachineNo;
+                    forQrCode.BindDate = DateTime.Now;
+                    forQrCode.MerchantId = MerchantId;
+                }
             }
             main1db.SaveChanges();
-            if (SnNo == MachineNo)
+            if (SnNo == MachineNo || string.IsNullOrEmpty(MachineNo))
             {
                 fields = new Dictionary<string, object>();
                 fields.Add("BuyUserId", merchant.UserId);
@@ -206,7 +208,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 }
                 // }
             }
-            if (SnNo == MachineNo)
+            if (SnNo == MachineNo || string.IsNullOrEmpty(MachineNo))
             {
                 PublicFunction.BindUserMachineData(main1db, merchant.UserId, 0, 1, SnNo);
             }

Util/Main/MerchantAddInfoUtil.cs

@@ -154,9 +154,9 @@ namespace MySystem
             {
                 if (MerchantAddInfoService.Exist(Id))
                 {
-                    Fields.Add("Status", 0);
-                    Fields.Add("WeChatRemark", null);
-                    Fields.Add("AlipayRemark", null);
+                    // Fields.Add("Status", 0);
+                    // Fields.Add("WeChatRemark", null);
+                    // Fields.Add("AlipayRemark", null);
                     info = MerchantAddInfoService.Edit(Fields, Id, false);
                 }
                 else