更新实体模型，设置商户型创客添加限制

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1100,6 +1100,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "商户编号不存在";
             }
+            if (merchant.KqSnNo != pos.PosSn || merchant.Id != pos.BindMerchantId)
+            {
+                return "机具" + PosSn + "和商户" + MerNo + "信息不匹配";
+            }
+            if (merchant.MerUserType > 0)
+            {
+                return "商户" + MerNo + "已经被设置";
+            }
             pos.SeoTitle = user.Id.ToString();
             pos.UserId = user.Id;
             if (pos.BindMerchantId == 0)
@@ -5452,7 +5460,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
-        
+
         #region 码牌加密
 
         public IActionResult QrCodeEncryption(string right)

Models/PosMachinesTwo.cs

@@ -60,5 +60,6 @@ namespace MySystem.Models
         public string SourcePosSn { get; set; }
         public int RecycStatus { get; set; }
         public string OutBatchNo { get; set; }
+        public int WithholdFlag { get; set; }
     }
 }

Models/PreSendStockDetail.cs

@@ -29,5 +29,6 @@ namespace MySystem.Models
         public int BrandId { get; set; }
         public int StoreId { get; set; }
         public ulong AuthFlag { get; set; }
+        public int WithholdFlag { get; set; }
     }
 }

Models/TableSplit.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class TableSplit
+    {
+        public string TableName { get; set; }
+        public int EndId { get; set; }
+        public int StartId { get; set; }
+    }
+}

Models/WebCMSEntities.cs

@@ -218,6 +218,7 @@ namespace MySystem.Models
         public virtual DbSet<SysLog> SysLog { get; set; }
         public virtual DbSet<SysRechargeRecord> SysRechargeRecord { get; set; }
         public virtual DbSet<SystemSet> SystemSet { get; set; }
+        public virtual DbSet<TableSplit> TableSplit { get; set; }
         public virtual DbSet<TeamApply> TeamApply { get; set; }
         public virtual DbSet<TeamApplyForTeamName> TeamApplyForTeamName { get; set; }
         public virtual DbSet<TeamApplyForTeamNo> TeamApplyForTeamNo { get; set; }
@@ -9885,6 +9886,10 @@ namespace MySystem.Models
                     .HasColumnType("longtext")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.WithholdFlag)
+                    .HasColumnType("int(11)")
+                    .HasComment("预扣标记");
             });
 
             modelBuilder.Entity<PosMerchantInfo>(entity =>
@@ -10350,6 +10355,10 @@ namespace MySystem.Models
                 entity.Property(e => e.ToUserId).HasColumnType("int(11)");
 
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.WithholdFlag)
+                    .HasColumnType("int(11)")
+                    .HasComment("预扣标记");
             });
 
             modelBuilder.Entity<ProductComment>(entity =>
@@ -10794,8 +10803,6 @@ namespace MySystem.Models
 
             modelBuilder.Entity<Products>(entity =>
             {
-                entity.HasComment("商品信息");
-
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.BannerPhoto)
@@ -10808,7 +10815,7 @@ namespace MySystem.Models
                 entity.Property(e => e.BuyCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.ColId)
-                    .HasColumnType("varchar(100)")
+                    .HasColumnType("varchar(30)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
@@ -15105,6 +15112,28 @@ namespace MySystem.Models
                     .HasCollation("utf8_general_ci");
             });
 
+            modelBuilder.Entity<TableSplit>(entity =>
+            {
+                entity.HasKey(e => e.TableName)
+                    .HasName("PRIMARY");
+
+                entity.HasComment("表优化配置");
+
+                entity.Property(e => e.TableName)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("表名")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.EndId)
+                    .HasColumnType("int(11)")
+                    .HasComment("结束Id");
+
+                entity.Property(e => e.StartId)
+                    .HasColumnType("int(11)")
+                    .HasComment("开始Id");
+            });
+
             modelBuilder.Entity<TeamApply>(entity =>
             {
                 entity.HasComment("开团申请");