助利宝商户交易按月统计

AppStart/Helper/StatHelpProfitService.cs

@@ -75,6 +75,12 @@ namespace MySystem
                                 bool Check = CheckAmount(db, MerchantId, merIds.UserId, TradeMonth);
                                 if (Check)
                                 {
+                                    decimal MoreAmount = TradeAmount * 0.01M;
+                                    int random = function.get_Random(0, 10000);
+                                    // if(MoreAmount > 1 && random < 5000)
+                                    // {
+                                    MoreAmount = decimal.Parse(function.CheckInt(MoreAmount.ToString().Split(".")[0]));
+                                    // }
                                     HelpProfitMerTradeSummay selfStat = db.HelpProfitMerTradeSummay.FirstOrDefault(m => m.MerchantId == MerchantId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate);
                                     if (selfStat == null)
                                     {
@@ -86,13 +92,19 @@ namespace MySystem
                                         }).Entity;
                                         db.SaveChanges();
                                     }
-                                    decimal MoreAmount = TradeAmount * 0.01M;
-                                    int random = function.get_Random(0, 10000);
-                                    // if(MoreAmount > 1 && random < 5000)
-                                    // {
-                                    MoreAmount = decimal.Parse(function.CheckInt(MoreAmount.ToString().Split(".")[0]));
-                                    // }
                                     selfStat.TradeAmount += TradeAmount + MoreAmount;
+
+                                    HelpProfitMerTradeMonthSummay monthStat = db.HelpProfitMerTradeMonthSummay.FirstOrDefault(m => m.MerchantId == MerchantId && m.TradeMonth == TradeMonth);
+                                    if (monthStat == null)
+                                    {
+                                        monthStat = db.HelpProfitMerTradeMonthSummay.Add(new HelpProfitMerTradeMonthSummay()
+                                        {
+                                            TradeMonth = TradeMonth,
+                                            MerchantId = MerchantId,
+                                        }).Entity;
+                                        db.SaveChanges();
+                                    }
+                                    monthStat.TradeAmount += TradeAmount + MoreAmount;
                                 }
                             }
                             OtherMySqlConn.op("update TradeRecord set QueryCount=3 where Id in (" + ids.TrimEnd(',') + ")");
@@ -263,12 +275,8 @@ namespace MySystem
             decimal MaxTradeAmount = Summary.MaxAmount; //当月最大交易总额
             decimal CheckAmount = 500000 < MaxTradeAmount * 0.3M ? 500000 : MaxTradeAmount * 0.3M;
             //当月单台交易额 <= 50万或当月最大交易总额的30%（取小值），则入账
-            decimal SingleTradeAmount = 0;
-            bool MerCheck = db.HelpProfitMerTradeSummay.Any(m => m.MerchantId == MerchantId && m.TradeMonth == TradeMonth);
-            if(MerCheck)
-            {
-                SingleTradeAmount = db.HelpProfitMerTradeSummay.Where(m => m.MerchantId == MerchantId && m.TradeMonth == TradeMonth).Sum(m => m.TradeAmount);
-            }
+            HelpProfitMerTradeMonthSummay MonthStat = db.HelpProfitMerTradeMonthSummay.FirstOrDefault(m => m.MerchantId == MerchantId && m.TradeMonth == TradeMonth) ?? new HelpProfitMerTradeMonthSummay();
+            decimal SingleTradeAmount = MonthStat.TradeAmount;
             if (SingleTradeAmount < CheckAmount)
             {
                 //当月总交易额不超过当月最大交易总额，则入账

PxcModels/HelpProfitMerTradeMonthSummay.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class HelpProfitMerTradeMonthSummay
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int BrandId { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string TradeMonth { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

PxcModels/MsgAlert.cs

@@ -9,11 +9,8 @@ namespace MySystem.PxcModels
         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; }
@@ -36,5 +33,8 @@ namespace MySystem.PxcModels
         public string Summary { get; set; }
         public string Title { get; set; }
         public int MsgType { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public int Version { get; set; }
     }
 }

PxcModels/ProfitRewardExport.cs

@@ -35,5 +35,7 @@ namespace MySystem.PxcModels
         public int UserLevel { get; set; }
         public string RealName { get; set; }
         public string MakerCode { get; set; }
+        public decimal ProfitCreditTradeProfit { get; set; }
+        public decimal ProfitCreditTradeAmt { get; set; }
     }
 }

PxcModels/ProfitRewardRecord.cs

@@ -73,5 +73,9 @@ namespace MySystem.PxcModels
         public int BrandId { get; set; }
         public int MerchantId { get; set; }
         public int UserId { get; set; }
+        public decimal ProfitDebitProfitRate { get; set; }
+        public decimal ProfitCreditProfitRate { get; set; }
+        public decimal ProfitDebitNonTradeCapProfit { get; set; }
+        public decimal ProfitCreditTradeProfit { get; set; }
     }
 }

PxcModels/SchoolMaterials.cs

@@ -9,11 +9,8 @@ namespace MySystem.PxcModels
         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; }

PxcModels/SchoolSignInData.cs

@@ -9,11 +9,8 @@ namespace MySystem.PxcModels
         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; }

PxcModels/SchoolSignInRecord.cs

@@ -9,11 +9,8 @@ namespace MySystem.PxcModels
         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; }

PxcModels/SchoolSignInTask.cs

@@ -9,11 +9,8 @@ namespace MySystem.PxcModels
         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; }

PxcModels/SchoolSignInTaskRecord.cs

@@ -9,11 +9,8 @@ namespace MySystem.PxcModels
         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; }

PxcModels/UserAccount.cs

@@ -38,9 +38,9 @@ namespace MySystem.PxcModels
         public decimal ValidAmount { get; set; }
         public decimal LeaderBalanceAmount { get; set; }
         public decimal HelpProfitBalanceAmount { get; set; }
-        public decimal TempAmountForBalance { get; set; }
-        public decimal ThisMonthPreAmount { get; set; }
-        public decimal ValidPreAmount { get; set; }
         public decimal SmallStoreDeposit { get; set; }
+        public decimal ValidPreAmount { get; set; }
+        public decimal ThisMonthPreAmount { get; set; }
+        public decimal TempAmountForBalance { get; set; }
     }
 }

PxcModels/WebCMSEntities.cs

@@ -56,6 +56,7 @@ namespace MySystem.PxcModels
         public virtual DbSet<HelpProfitExchange> HelpProfitExchange { get; set; }
         public virtual DbSet<HelpProfitExchangeDetail> HelpProfitExchangeDetail { get; set; }
         public virtual DbSet<HelpProfitMerIds> HelpProfitMerIds { get; set; }
+        public virtual DbSet<HelpProfitMerTradeMonthSummay> HelpProfitMerTradeMonthSummay { get; set; }
         public virtual DbSet<HelpProfitMerTradeSummay> HelpProfitMerTradeSummay { get; set; }
         public virtual DbSet<HelpProfitMerchantForUser> HelpProfitMerchantForUser { get; set; }
         public virtual DbSet<HelpProfitRebateDetail> HelpProfitRebateDetail { get; set; }
@@ -155,12 +156,9 @@ namespace MySystem.PxcModels
         public virtual DbSet<ProfitReceiveRecord> ProfitReceiveRecord { get; set; }
         public virtual DbSet<ProfitReceives> ProfitReceives { get; set; }
         public virtual DbSet<ProfitRecord> ProfitRecord { get; set; }
-        public virtual DbSet<ProfitRecordCopy1> ProfitRecordCopy1 { get; set; }
         public virtual DbSet<ProfitRewardExport> ProfitRewardExport { get; set; }
         public virtual DbSet<ProfitRewardRecord> ProfitRewardRecord { get; set; }
-        public virtual DbSet<ProfitRewardRecordCopy1> ProfitRewardRecordCopy1 { get; set; }
         public virtual DbSet<ProfitSubsidyDetail> ProfitSubsidyDetail { get; set; }
-        public virtual DbSet<ProfitSubsidyDetailCopy1> ProfitSubsidyDetailCopy1 { get; set; }
         public virtual DbSet<ProfitSubsidyExport> ProfitSubsidyExport { get; set; }
         public virtual DbSet<PublicAccountSet> PublicAccountSet { get; set; }
         public virtual DbSet<PullNewAct> PullNewAct { get; set; }
@@ -196,7 +194,6 @@ namespace MySystem.PxcModels
         public virtual DbSet<StoreSwapSn> StoreSwapSn { get; set; }
         public virtual DbSet<SubsidyCheck> SubsidyCheck { get; set; }
         public virtual DbSet<SubsidyRecord> SubsidyRecord { get; set; }
-        public virtual DbSet<SubsidyRecordCopy1> SubsidyRecordCopy1 { get; set; }
         public virtual DbSet<SysAdmin> SysAdmin { get; set; }
         public virtual DbSet<SysAdminRole> SysAdminRole { get; set; }
         public virtual DbSet<SysLog> SysLog { get; set; }
@@ -270,6 +267,9 @@ namespace MySystem.PxcModels
         {
             modelBuilder.Entity<ActiveReward>(entity =>
             {
+                entity.HasIndex(e => e.KqSnNo)
+                    .HasName("ActiveRewardIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.ActDate).HasColumnType("datetime");
@@ -2734,6 +2734,9 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<FluxProfitDetail>(entity =>
             {
+                entity.HasIndex(e => e.SnNo)
+                    .HasName("FluxProfitDetailIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.BrandId).HasColumnType("int(11)");
@@ -2994,6 +2997,9 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<HelpProfitAmountSummary>(entity =>
             {
+                entity.HasIndex(e => new { e.UserId, e.TradeMonth })
+                    .HasName("HelpProfitAmountSummaryIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
@@ -3139,13 +3145,60 @@ namespace MySystem.PxcModels
                 entity.HasKey(e => e.MerchantId)
                     .HasName("PRIMARY");
 
+                entity.HasIndex(e => e.UserId)
+                    .HasName("HelpProfitMerIdsIndex");
+
                 entity.Property(e => e.MerchantId).HasColumnType("int(11)");
 
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<HelpProfitMerTradeMonthSummay>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                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.TradeAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+            });
+
             modelBuilder.Entity<HelpProfitMerTradeSummay>(entity =>
             {
+                entity.HasIndex(e => new { e.MerchantId, e.TradeMonth, e.TradeDate })
+                    .HasName("HelpProfitMerTradeSummayIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.BrandId).HasColumnType("int(11)");
@@ -3204,6 +3257,9 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<HelpProfitMerchantForUser>(entity =>
             {
+                entity.HasIndex(e => new { e.UserId, e.MerchantId, e.Sort })
+                    .HasName("HelpProfitMerchantForUserIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
@@ -7077,6 +7133,9 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<OpenRewardDetail>(entity =>
             {
+                entity.HasIndex(e => e.SnNo)
+                    .HasName("OpenRewardDetailIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.BrandId).HasColumnType("int(11)");
@@ -8451,6 +8510,9 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<PosMachinesTwo>(entity =>
             {
+                entity.HasIndex(e => new { e.PosSn, e.BrandId })
+                    .HasName("PosMachinesTwoIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.ActivationState).HasColumnType("int(11)");
@@ -8596,6 +8658,9 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<PosMerchantInfo>(entity =>
             {
+                entity.HasIndex(e => new { e.BrandId, e.KqSnNo, e.KqMerNo })
+                    .HasName("PosMerchantInfoIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.ActType).HasColumnType("int(11)");
@@ -10506,100 +10571,6 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
-            modelBuilder.Entity<ProfitRecordCopy1>(entity =>
-            {
-                entity.ToTable("ProfitRecord_copy1");
-
-                entity.Property(e => e.Id).HasColumnType("int(11)");
-
-                entity.Property(e => e.BrandId).HasColumnType("int(11)");
-
-                entity.Property(e => e.CapFlag).HasColumnType("int(11)");
-
-                entity.Property(e => e.ClearDate).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.DirectFlag)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.HelpMonthCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.MerBuddyType).HasColumnType("int(11)");
-
-                entity.Property(e => e.MerHelpFlag)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.MerNo)
-                    .HasColumnType("varchar(32)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
-
-                entity.Property(e => e.ParentNav)
-                    .HasColumnType("varchar(1000)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.ProfitAmount).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.QrPayFlag).HasColumnType("int(11)");
-
-                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.SnNo)
-                    .HasColumnType("varchar(32)")
-                    .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.TradeDate).HasColumnType("datetime");
-
-                entity.Property(e => e.TradeId).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.UserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.Version).HasColumnType("int(11)");
-            });
-
             modelBuilder.Entity<ProfitRewardExport>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -10646,6 +10617,10 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.NotHelpCreditTradeProfit).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.ProfitCreditTradeAmt).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitCreditTradeProfit).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.QrCreditTradeAmt).HasColumnType("decimal(18,2)");
 
                 entity.Property(e => e.QrCreditTradeProfit).HasColumnType("decimal(18,2)");
@@ -10777,6 +10752,14 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.OtherTradeAmt).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.ProfitCreditProfitRate).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitCreditTradeProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDebitNonTradeCapProfit).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.ProfitDebitProfitRate).HasColumnType("decimal(18,2)");
+
                 entity.Property(e => e.ProfitType).HasColumnType("int(11)");
 
                 entity.Property(e => e.QrCreditAddOrSubRate).HasColumnType("decimal(18,2)");
@@ -10853,15 +10836,13 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
-            modelBuilder.Entity<ProfitRewardRecordCopy1>(entity =>
+            modelBuilder.Entity<ProfitSubsidyDetail>(entity =>
             {
-                entity.ToTable("ProfitRewardRecord_copy1");
-
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
-                entity.Property(e => e.BrandId).HasColumnType("int(11)");
+                entity.Property(e => e.BelongUserId).HasColumnType("int(11)");
 
-                entity.Property(e => e.CheckStatus).HasColumnType("int(11)");
+                entity.Property(e => e.BrandId).HasColumnType("int(11)");
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
 
@@ -10870,100 +10851,34 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.CreditTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.CreditTradeProfit).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.DebitCapSingleReward).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.DebitCapTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.DebitCapTradeNum).HasColumnType("int(11)");
-
-                entity.Property(e => e.DebitNonCapTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.DebitNonTradeCapProfit).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.DebitTradeCapProfit).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.HelpCreditAddOrSubRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.HelpCreditProfitRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.HelpCreditProfitStandardRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.HelpCreditTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.HelpCreditTradeProfit).HasColumnType("decimal(18,2)");
+                entity.Property(e => e.CreditProfitRate).HasColumnType("decimal(18,2)");
 
-                entity.Property(e => e.HelpDebitAddOrSubRate).HasColumnType("decimal(18,2)");
+                entity.Property(e => e.CreditTradeAmt).HasColumnType("decimal(18,2)");
 
-                entity.Property(e => e.HelpDebitNonCapTradeAmt).HasColumnType("decimal(18,2)");
+                entity.Property(e => e.MerHelpFlag)
+                    .HasColumnType("bit(1)")
+                    .HasDefaultValueSql("b'0'");
 
-                entity.Property(e => e.HelpDebitNonTradeCapProfit).HasColumnType("decimal(18,2)");
+                entity.Property(e => e.MerNo)
+                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.HelpDebitProfitRate).HasColumnType("decimal(18,2)");
+                entity.Property(e => e.MerRegTime).HasColumnType("datetime");
 
-                entity.Property(e => e.HelpDebitProfitStandardRate).HasColumnType("decimal(18,2)");
+                entity.Property(e => e.MerStandardDate).HasColumnType("datetime");
 
                 entity.Property(e => e.MerchantId).HasColumnType("int(11)");
 
                 entity.Property(e => e.NonQrCreditTradeAmt).HasColumnType("decimal(18,2)");
 
-                entity.Property(e => e.NonQrCreditTradeProfit).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.NonQrDebitNonTradeCapProfit).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.NonQrDebitNotCapTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.NotHelpCreditAddOrSubRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.NotHelpCreditProfitRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.NotHelpCreditProfitStandardRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.NotHelpCreditTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.NotHelpCreditTradeProfit).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.NotHelpDebitAddOrSubRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.NotHelpDebitNonCapTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.NotHelpDebitNonTradeCapProfit).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.NotHelpDebitProfitRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.NotHelpDebitProfitStandardRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.OtherCreditTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.OtherDebitNotCapTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.OtherTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.ProfitType).HasColumnType("int(11)");
-
-                entity.Property(e => e.QrCreditAddOrSubRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.QrCreditProfitRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.QrCreditProfitStandardRate).HasColumnType("decimal(18,2)");
+                entity.Property(e => e.ProductName)
+                    .HasColumnType("varchar(16)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.QrCreditTradeAmt).HasColumnType("decimal(18,2)");
 
-                entity.Property(e => e.QrCreditTradeProfit).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.QrDebitAddOrSubRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.QrDebitNonTradeCapProfit).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.QrDebitNotCapTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.QrDebitProfitRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.QrDebitProfitStandardRate).HasColumnType("decimal(18,2)");
-
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.RecordNo)
@@ -10988,212 +10903,11 @@ namespace MySystem.PxcModels
 
                 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.TopUserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.TradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.TradeMonth)
-                    .HasColumnType("varchar(6)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.TradeProfit).HasColumnType("decimal(18,2)");
-
-                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.UserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.Version).HasColumnType("int(11)");
-            });
-
-            modelBuilder.Entity<ProfitSubsidyDetail>(entity =>
-            {
-                entity.Property(e => e.Id).HasColumnType("int(11)");
-
-                entity.Property(e => e.BelongUserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.BrandId).HasColumnType("int(11)");
-
-                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.CreditProfitRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.CreditTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.MerHelpFlag)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.MerNo)
-                    .HasColumnType("varchar(32)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.MerRegTime).HasColumnType("datetime");
-
-                entity.Property(e => e.MerStandardDate).HasColumnType("datetime");
-
-                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
-
-                entity.Property(e => e.NonQrCreditTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.ProductName)
-                    .HasColumnType("varchar(16)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.QrCreditTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.RecordNo)
-                    .HasColumnType("varchar(32)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                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.SnNo)
-                    .HasColumnType("varchar(32)")
-                    .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.SubsidyProfit).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.SubsidyProfitRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.SubsidyType).HasColumnType("int(11)");
-
-                entity.Property(e => e.SubsidyUserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.TradeMonth)
-                    .HasColumnType("varchar(6)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                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<ProfitSubsidyDetailCopy1>(entity =>
-            {
-                entity.ToTable("ProfitSubsidyDetail_copy1");
-
-                entity.Property(e => e.Id).HasColumnType("int(11)");
-
-                entity.Property(e => e.BelongUserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.BrandId).HasColumnType("int(11)");
-
-                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.CreditProfitRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.CreditTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.MerHelpFlag)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.MerNo)
-                    .HasColumnType("varchar(32)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.MerRegTime).HasColumnType("datetime");
-
-                entity.Property(e => e.MerStandardDate).HasColumnType("datetime");
-
-                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
-
-                entity.Property(e => e.NonQrCreditTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.ProductName)
-                    .HasColumnType("varchar(16)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.QrCreditTradeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.RecordNo)
-                    .HasColumnType("varchar(32)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                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.SnNo)
-                    .HasColumnType("varchar(32)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SnNo)
+                    .HasColumnType("varchar(32)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
@@ -11751,6 +11465,9 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<RecommendTradeSummary>(entity =>
             {
+                entity.HasIndex(e => new { e.UserId, e.TradeMonth, e.PosSn })
+                    .HasName("RecommendTradeSummaryIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
@@ -11916,11 +11633,6 @@ namespace MySystem.PxcModels
 
                 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.MakerCode)
                     .HasColumnType("varchar(20)")
                     .HasCharSet("utf8")
@@ -11959,11 +11671,6 @@ namespace MySystem.PxcModels
 
                 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.Url)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
@@ -11975,8 +11682,6 @@ namespace MySystem.PxcModels
                     .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
             modelBuilder.Entity<SchoolMorningMeet>(entity =>
@@ -12102,11 +11807,6 @@ namespace MySystem.PxcModels
 
                 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.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.RingFlag)
@@ -12135,13 +11835,6 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.TotalDays).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<SchoolSignInRecord>(entity =>
@@ -12150,11 +11843,6 @@ namespace MySystem.PxcModels
 
                 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.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
@@ -12178,14 +11866,7 @@ namespace MySystem.PxcModels
 
                 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.UserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
             modelBuilder.Entity<SchoolSignInTask>(entity =>
@@ -12194,11 +11875,6 @@ namespace MySystem.PxcModels
 
                 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.Details)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
@@ -12241,11 +11917,6 @@ namespace MySystem.PxcModels
 
                 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.Url)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
@@ -12255,8 +11926,6 @@ namespace MySystem.PxcModels
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
             modelBuilder.Entity<SchoolSignInTaskRecord>(entity =>
@@ -12265,11 +11934,6 @@ namespace MySystem.PxcModels
 
                 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.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
@@ -12295,14 +11959,7 @@ namespace MySystem.PxcModels
 
                 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.UserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
             modelBuilder.Entity<ServiceCenter>(entity =>
@@ -12623,6 +12280,9 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<StoreChangeHistory>(entity =>
             {
+                entity.HasIndex(e => e.SnNo)
+                    .HasName("StoreChangeHistoryIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.BizBatchNo)
@@ -13508,91 +13168,6 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
             });
 
-            modelBuilder.Entity<SubsidyRecordCopy1>(entity =>
-            {
-                entity.ToTable("SubsidyRecord_copy1");
-
-                entity.HasIndex(e => new { e.UserId, e.SeoTitle, e.BrandId })
-                    .HasName("SubsidyRecordIndex");
-
-                entity.Property(e => e.Id).HasColumnType("int(11)");
-
-                entity.Property(e => e.BrandId).HasColumnType("int(11)");
-
-                entity.Property(e => e.CapFlag).HasColumnType("int(11)");
-
-                entity.Property(e => e.ClearDate).HasColumnType("datetime");
-
-                entity.Property(e => e.CreateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.DirectFlag)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.HelpMonthCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.MerBuddyType).HasColumnType("int(11)");
-
-                entity.Property(e => e.MerHelpFlag)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.MerNo)
-                    .HasColumnType("varchar(32)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
-
-                entity.Property(e => e.ParentNav)
-                    .HasColumnType("varchar(1000)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.ProfitAmount).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.QrPayFlag).HasColumnType("int(11)");
-
-                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.SnNo)
-                    .HasColumnType("varchar(32)")
-                    .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.TradeDate).HasColumnType("datetime");
-
-                entity.Property(e => e.TradeId).HasColumnType("int(11)");
-
-                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
-
-                entity.Property(e => e.UserId).HasColumnType("int(11)");
-            });
-
             modelBuilder.Entity<SysAdmin>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -15669,6 +15244,9 @@ namespace MySystem.PxcModels
 
             modelBuilder.Entity<UserCashRecord>(entity =>
             {
+                entity.HasIndex(e => new { e.UserId, e.TradeType, e.CashOrderNo })
+                    .HasName("UserCashRecordIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.ActualTradeAmount).HasColumnType("decimal(18,2)");