修复补录数据

AppStart/Helper/SycnSpTradeService.cs

@@ -33,6 +33,7 @@ namespace MySystem
                             if (trade.SerEntryMode == "N" && trade.ProductType == "1")
                             {
                                 pos.SeoKeyword = trade.TradeAmount.ToString("f2");
+                                // pos.IsPurchase = 0;
                                 db.SaveChanges();
                             }
                         }
@@ -44,6 +45,26 @@ namespace MySystem
                         spdb.SaveChanges();
                     }
                 }
+                if (trade.DiscountRateFlag == "True")
+                {
+                    op = false;
+                    SpModels.TradeRecord edit = spdb.TradeRecord.FirstOrDefault(m => m.Id == trade.Id);
+                    if (edit != null)
+                    {
+                        edit.Status = 2;
+                    }
+                    spdb.SaveChanges();
+                }
+                if(trade.ProductType == "7" && trade.TradeStatus != "00")
+                {
+                    op = false;
+                    SpModels.TradeRecord edit = spdb.TradeRecord.FirstOrDefault(m => m.Id == trade.Id);
+                    if (edit != null)
+                    {
+                        edit.Status = 2;
+                    }
+                    spdb.SaveChanges();
+                }
                 if (op)
                 {
                     MachineForMerNo posFor = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == trade.MerNo) ?? new MachineForMerNo();
@@ -58,72 +79,167 @@ namespace MySystem
                             {
                                 TopUserId = int.Parse(user.ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
                             }
-                            bool check = db.TradeRecord.Any(m => m.RecordNo == trade.TradeSerialNo);
+                            // TODO: 交易记录表，每月的Id单独存放，解决查询效率问题
+                            bool check = db.TradeRecord.Any(m => m.Id >= 700000 && m.RecordNo == trade.TradeSerialNo);
                             if (!check)
                             {
                                 decimal TradeAmount = trade.TradeAmount;
                                 int BankCardType = -1;
                                 int QrPayFlag = 0;
+                                int VipFlag = 0;
+                                int PayType = 0;
                                 if (pos.BrandId == 1 || pos.BrandId == 3)
                                 {
                                     TradeAmount = TradeAmount / 100;
                                     BankCardType = int.Parse(trade.BankCardType);
-                                    if(trade.TradeType == "02") QrPayFlag = 1;
+                                    if (trade.TradeType == "02") QrPayFlag = 1;
+                                    else if (trade.TradeType == "NQ") PayType = 1;
+                                    if (trade.SettleMethod == "E") VipFlag = 1;
                                 }
                                 else if (pos.BrandId == 2)
                                 {
-                                    if (trade.TradeType == "CREDIT_BY_CARD")
+                                    if (trade.TradeType == "DEBIT_BY_CARD")
+                                    {
+                                        BankCardType = 0;
+                                    }
+                                    else
+                                    {
+                                        BankCardType = 1;
+                                    }
+                                    if (trade.TradeType == "CLOUD_PAY") QrPayFlag = 1;
+                                }
+                                else if (pos.BrandId == 4 || pos.BrandId == 5)
+                                {
+                                    TradeAmount = TradeAmount / 100;
+                                    if (trade.BankCardType == "100")
                                     {
                                         BankCardType = 1;
                                     }
-                                    else if (trade.TradeType == "DEBIT_BY_CARD")
+                                    else if (trade.BankCardType == "200")
+                                    {
+                                        BankCardType = 0;
+                                    }
+                                    if (trade.TradeType == "200") QrPayFlag = 1;
+                                    if (trade.Field1 == "1") VipFlag = 1;
+                                }
+                                else if (pos.BrandId == 6)
+                                {
+                                    TradeAmount = TradeAmount / 100;
+                                    if (trade.BankCardType == "01" || trade.BankCardType == "11")
+                                    {
+                                        BankCardType = 0;
+                                    }
+                                    else
+                                    {
+                                        BankCardType = 1;
+                                    }
+                                }
+                                else if (pos.BrandId == 7)
+                                {
+                                    TradeAmount = TradeAmount / 100;
+                                    if (trade.BankCardType == "OA" || trade.BankCardType == "CC" || trade.BankCardType == "SCC")
+                                    {
+                                        BankCardType = 1;
+                                    }
+                                    else
                                     {
                                         BankCardType = 0;
                                     }
-                                    if(trade.TradeType == "CLOUD_PAY") QrPayFlag = 1;
                                 }
                                 int BrandId = int.Parse(trade.ProductType);
-                                if (trade.MerNo.StartsWith("M900"))
+                                if (BrandId == 1 && trade.MerNo.StartsWith("M900"))
                                 {
                                     BrandId = 3;
                                 }
-                                db.TradeRecord.Add(new TradeRecord()
+                                if (BrandId == 4 && trade.DeviceType == "200")
                                 {
-                                    CreateDate = trade.CreateDate,
-                                    UpdateDate = trade.UpdateDate,
-                                    RecordNo = trade.TradeSerialNo, //单号
-                                    UserId = pos.UserId, //创客
-                                    MerchantId = pos.BindMerchantId, //商户
-                                    MerNo = trade.MerNo, //渠道商户编号
-                                    MerHelpFlag = 0, //是否属于扶持周期内商户
-                                    HelpMonthCount = 0, //扶持第几个月
-                                    MerBuddyType = user.MerchantType, //商户创客类型
-                                    SnNo = trade.TradeSnNo, //渠道SN号
-                                    // TradeDate = DateTime.Parse(trade.TradeTime), //交易日期
-                                    TradeSerialNo = trade.ChannelSerial, //交易流水号
-                                    TradeAmount = TradeAmount, //交易金额
-                                    BankCardType = BankCardType, //银行卡类型
-                                    QrPayFlag = QrPayFlag, //云闪付标识
-                                    BrandId = BrandId, //品牌
-                                    Remark = trade.Remark, //备注
-                                    TopUserId = TopUserId, //顶级创客
-                                    MerUserId = pos.UserId, //商户直属创客
-                                });
-                                if (BankCardType == 1)
+                                    BrandId = 5;
+                                }
+                                decimal SourceTradeAmount = TradeAmount;
+                                if (pos.Sort == 0 && pos.BrandId == 7)
                                 {
-                                    pos.CreditTrade += TradeAmount;
+                                    decimal deposit = decimal.Parse(function.CheckNum(pos.SeoKeyword));
+                                    if (deposit > 0)
+                                    {
+                                        TradeAmount -= deposit;
+                                        pos.Sort = 1;
+                                    }
+                                }
+                                if (TradeAmount > 0)
+                                {
+                                    ulong MerHelpFlag = 0;
+                                    decimal DepositAmt = decimal.Parse(function.CheckNum(pos.SeoKeyword));
+                                    if (DepositAmt > 0)
+                                    {
+                                        int Days = int.Parse(RedisDbconn.Instance.Get<string>("pobjrule:" + pos.BrandId + ":HelpPolicy:Days")); //天数
+                                        if (pos.BindingTime != null)
+                                        {
+                                            if (pos.BindingTime.Value.AddDays(Days) > DateTime.Now)
+                                            {
+                                                MerHelpFlag = 1;
+                                            }
+                                        }
+                                    }
+                                    int CapFlag = 0;
+                                    if(BankCardType == 0 && TradeAmount >= 1666.67M)
+                                    {
+                                        CapFlag = 1;
+                                    }
+                                    db.TradeRecord.Add(new TradeRecord()
+                                    {
+                                        ParentNav = user.ParentNav,
+                                        CreateDate = trade.CreateDate,
+                                        UpdateDate = trade.UpdateDate,
+                                        RecordNo = trade.TradeSerialNo, //单号
+                                        UserId = pos.UserId, //创客
+                                        MerchantId = pos.BindMerchantId, //商户
+                                        MerNo = trade.MerNo, //渠道商户编号
+                                        MerHelpFlag = MerHelpFlag, //是否属于扶持周期内商户
+                                        HelpMonthCount = 0, //扶持第几个月
+                                        MerBuddyType = user.MerchantType, //商户创客类型
+                                        SnNo = trade.TradeSnNo, //渠道SN号
+                                        TradeSerialNo = trade.ChannelSerial, //交易流水号
+                                        TradeAmount = TradeAmount, //交易金额
+                                        BankCardType = BankCardType, //银行卡类型
+                                        QrPayFlag = QrPayFlag, //云闪付标识
+                                        CapFlag = CapFlag, //借记卡是否封顶
+                                        VipFlag = VipFlag, //会员标记
+                                        PayType = PayType, //支付方式
+                                        BrandId = BrandId, //品牌
+                                        Remark = trade.Remark, //备注
+                                        TopUserId = TopUserId, //顶级创客
+                                        MerUserId = pos.UserId, //商户直属创客
+                                    });
+                                }
+                                decimal CheckMoney = 1000;
+                                int CheckDays = 30;
+                                if (pos.BrandId == 6)
+                                {
+                                    CheckMoney = 5000;
+                                }
+                                if (BankCardType == 1 || (BankCardType == 2 && pos.BrandId == 1) || (BankCardType == 2 && pos.BrandId == 3))
+                                {
+                                    pos.CreditTrade += SourceTradeAmount;
                                 }
                                 else if (BankCardType == 0)
                                 {
                                     pos.DebitCardTrade += TradeAmount;
                                 }
-                                // if (pos.CreditTrade < 1000)
+                                // if (pos.CreditTrade < CheckMoney)
                                 // {
-                                //     pos.IsPurchase = 99;
+                                //     decimal deposit = decimal.Parse(function.CheckNum(pos.SeoKeyword));
+                                //     if (deposit > 0 && pos.IsPurchase != 1)
+                                //     {
+                                //         pos.IsPurchase = 0;
+                                //     }
                                 // }
-                                else if (pos.CreditTrade >= 1000 && pos.ActivationState == 0 && pos.BindingTime > DateTime.Now.AddDays(-20))
+                                if (pos.CreditTrade >= CheckMoney && pos.ActivationState == 0 && pos.TransferTime < pos.BindingTime && pos.BindingTime > DateTime.Now.AddDays(-CheckDays))
                                 {
-                                    // pos.IsPurchase = 0;
+                                    // decimal deposit = decimal.Parse(function.CheckNum(pos.SeoKeyword));
+                                    // if (deposit == 0 && pos.IsPurchase != 1)
+                                    // {
+                                    //     pos.IsPurchase = 0;
+                                    // }
                                     pos.ActivationState = 1;
                                     pos.ActivationTime = DateTime.Now;
                                     PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
@@ -134,6 +250,11 @@ namespace MySystem
                                         db.SaveChanges();
                                         RedisDbconn.Instance.Set("PosMerchantInfo:" + merchant.Id, merchant);
                                     }
+                                    //发放大盟主奖励
+                                    if(pos.LeaderUserId > 0)
+                                    {
+                                        RedisDbconn.Instance.AddList("LeaderPrizeQueue", pos.Id);
+                                    }
                                 }
                                 db.SaveChanges();
                             }

SpModels/ActivateRecord.cs

@@ -31,5 +31,10 @@ namespace MySystem.SpModels
         public string MerName { get; set; }
         public string MerNo { get; set; }
         public string ChannelSerial { get; set; }
+        public string Field5 { get; set; }
+        public string Field4 { get; set; }
+        public string Field3 { get; set; }
+        public string Field2 { get; set; }
+        public string Field1 { get; set; }
     }
 }

SpModels/BindRecord.cs

@@ -27,5 +27,10 @@ namespace MySystem.SpModels
         public string MerName { get; set; }
         public string AgentName { get; set; }
         public string MerNo { get; set; }
+        public string Field5 { get; set; }
+        public string Field4 { get; set; }
+        public string Field3 { get; set; }
+        public string Field2 { get; set; }
+        public string Field1 { get; set; }
     }
 }

SpModels/ChangeBindRecord.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.SpModels
+{
+    public partial class ChangeBindRecord
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string AgentNo { get; set; }
+        public string Field5 { get; set; }
+        public string Field4 { get; set; }
+        public string Field3 { get; set; }
+        public string Field2 { get; set; }
+        public string Field1 { get; set; }
+        public string ChannelSerial { get; set; }
+        public DateTime? ReBindTime { get; set; }
+        public DateTime? ConfirmTime { get; set; }
+        public string Remark { get; set; }
+        public string MerNewSnNo { get; set; }
+        public string ProductType { get; set; }
+        public string MerSnNo { get; set; }
+        public string MerName { get; set; }
+        public string AgentName { get; set; }
+        public string MerNo { get; set; }
+    }
+}

SpModels/Merchants.cs

@@ -31,5 +31,10 @@ namespace MySystem.SpModels
         public string AgentName { get; set; }
         public string MerName { get; set; }
         public string MerNo { get; set; }
+        public string Field5 { get; set; }
+        public string Field4 { get; set; }
+        public string Field3 { get; set; }
+        public string Field2 { get; set; }
+        public string Field1 { get; set; }
     }
 }

SpModels/TradeFluxRecord.cs

@@ -40,5 +40,8 @@ namespace MySystem.SpModels
         public string MerName { get; set; }
         public string TradeSerialNo { get; set; }
         public string MerNo { get; set; }
+        public string Field3 { get; set; }
+        public string Field2 { get; set; }
+        public string Field1 { get; set; }
     }
 }

SpModels/TradeRecord.cs

@@ -43,5 +43,10 @@ namespace MySystem.SpModels
         public string MerName { get; set; }
         public string MerNo { get; set; }
         public string TradeSerialNo { get; set; }
+        public string Field5 { get; set; }
+        public string Field4 { get; set; }
+        public string Field3 { get; set; }
+        public string Field2 { get; set; }
+        public string Field1 { get; set; }
     }
 }

SpModels/UnBindRecord.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.SpModels
+{
+    public partial class UnBindRecord
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string AgentNo { get; set; }
+        public string Field5 { get; set; }
+        public string Field4 { get; set; }
+        public string Field3 { get; set; }
+        public string Field2 { get; set; }
+        public string Field1 { get; set; }
+        public string ChannelSerial { get; set; }
+        public DateTime? UnBindTime { get; set; }
+        public string Remark { get; set; }
+        public string ProductType { get; set; }
+        public string MerSnNo { get; set; }
+        public string MerName { get; set; }
+        public string AgentName { get; set; }
+        public string MerNo { get; set; }
+    }
+}

SpModels/WebCMSEntities.cs

@@ -17,6 +17,7 @@ namespace MySystem.SpModels
 
         public virtual DbSet<ActivateRecord> ActivateRecord { get; set; }
         public virtual DbSet<BindRecord> BindRecord { get; set; }
+        public virtual DbSet<ChangeBindRecord> ChangeBindRecord { get; set; }
         public virtual DbSet<CustomerTableRecord> CustomerTableRecord { get; set; }
         public virtual DbSet<KqActivate> KqActivate { get; set; }
         public virtual DbSet<KqActivateCallBack> KqActivateCallBack { get; set; }
@@ -36,11 +37,12 @@ namespace MySystem.SpModels
         public virtual DbSet<SysLog> SysLog { get; set; }
         public virtual DbSet<TradeFluxRecord> TradeFluxRecord { get; set; }
         public virtual DbSet<TradeRecord> TradeRecord { get; set; }
+        public virtual DbSet<UnBindRecord> UnBindRecord { get; set; }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             if (!optionsBuilder.IsConfigured)
-            {
+            {                
                 optionsBuilder.UseMySql(Library.ConfigurationManager.AppSettings["SpSqlConnStr"].ToString(), x => x.ServerVersion("5.7.17-mysql"));
             }
         }
@@ -90,6 +92,31 @@ namespace MySystem.SpModels
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
 
+                entity.Property(e => e.Field1)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field2)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field3)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field4)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field5)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.MerIdcardNo)
                     .HasColumnType("varchar(18)")
                     .HasCharSet("utf8")
@@ -174,6 +201,31 @@ namespace MySystem.SpModels
 
                 entity.Property(e => e.CreateTime).HasColumnType("datetime");
 
+                entity.Property(e => e.Field1)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field2)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field3)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field4)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field5)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.MerName)
                     .HasColumnType("varchar(32)")
                     .HasCharSet("utf8")
@@ -242,6 +294,122 @@ namespace MySystem.SpModels
                 entity.Property(e => e.UpdateTime).HasColumnType("datetime");
             });
 
+            modelBuilder.Entity<ChangeBindRecord>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AgentName)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.AgentNo)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ChannelSerial)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ConfirmTime).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field1)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field2)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field3)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field4)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field5)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerName)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerNewSnNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerSnNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ProductType)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.ReBindTime).HasColumnType("datetime");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<CustomerTableRecord>(entity =>
             {
                 entity.HasKey(e => e.TableEnName)
@@ -1307,6 +1475,31 @@ namespace MySystem.SpModels
 
                 entity.Property(e => e.CreateTime).HasColumnType("datetime");
 
+                entity.Property(e => e.Field1)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field2)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field3)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field4)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field5)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.MerAuditDate).HasColumnType("datetime");
 
                 entity.Property(e => e.MerIdcardNo)
@@ -1638,6 +1831,21 @@ namespace MySystem.SpModels
 
                 entity.Property(e => e.FeeAmount).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.Field1)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field2)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field3)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.InputModel)
                     .HasColumnType("varchar(32)")
                     .HasCharSet("utf8")
@@ -1666,7 +1874,7 @@ namespace MySystem.SpModels
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
-                    .HasColumnType("varchar(500)")
+                    .HasColumnType("varchar(2000)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
@@ -1794,6 +2002,31 @@ namespace MySystem.SpModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.Field1)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field2)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field3)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field4)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field5)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.IsStoreCashier)
                     .HasColumnType("varchar(16)")
                     .HasCharSet("utf8")
@@ -1902,6 +2135,115 @@ namespace MySystem.SpModels
                 entity.Property(e => e.UpdateDate).HasColumnType("datetime");
             });
 
+            modelBuilder.Entity<UnBindRecord>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.AgentName)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.AgentNo)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ChannelSerial)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field1)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field2)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field3)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field4)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Field5)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerName)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerSnNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ProductType)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(64)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.UnBindTime).HasColumnType("datetime");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Version).HasColumnType("int(11)");
+            });
+
             OnModelCreatingPartial(modelBuilder);
         }