商户登录列表显示问题

MainModels/WebCMSEntities.cs

@@ -270,7 +270,6 @@ namespace MySystem.MainModels
         public virtual DbSet<UserTradeDaySummary> UserTradeDaySummary { get; set; }
         public virtual DbSet<UserTradeMonthSummary> UserTradeMonthSummary { get; set; }
         public virtual DbSet<Users> Users { get; set; }
-        public virtual DbSet<UsersTmp> UsersTmp { get; set; }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
@@ -16056,6 +16055,9 @@ namespace MySystem.MainModels
 
             modelBuilder.Entity<UserAmountSummary>(entity =>
             {
+                entity.HasIndex(e => new { e.UserId, e.IsAct, e.TradeMonth, e.TradeDate, e.SeoTitle })
+                    .HasName("UserAmountSummaryIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.CreateDate).HasColumnType("datetime");
@@ -18807,337 +18809,6 @@ namespace MySystem.MainModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
-            modelBuilder.Entity<UsersTmp>(entity =>
-            {
-                entity.Property(e => e.Id).HasColumnType("int(11)");
-
-                entity.Property(e => e.AccessToken)
-                    .HasColumnType("varchar(64)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.ActiveRewardAmount).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.Address)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.AgentAreas)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.AgentLevel).HasColumnType("int(11)");
-
-                entity.Property(e => e.AlipayUserId)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.Areas)
-                    .HasColumnType("varchar(30)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.AuditStatus).HasColumnType("int(11)");
-
-                entity.Property(e => e.AuthDate).HasColumnType("datetime");
-
-                entity.Property(e => e.AuthFlag)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.BankCardPositiveImage)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.BusinessFlag).HasColumnType("int(11)");
-
-                entity.Property(e => e.CarIds)
-                    .HasColumnType("varchar(100)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.CardNo)
-                    .HasColumnType("varchar(30)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.CardRecCode)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.CashFreezeAmt).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.CashNote)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.CashStatus).HasColumnType("int(11)");
-
-                entity.Property(e => e.CertFrontImage)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.CertId)
-                    .HasColumnType("varchar(30)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.CertReverseImage)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.CertValidEndDate).HasColumnType("datetime");
-
-                entity.Property(e => e.CertValidStartDate).HasColumnType("datetime");
-
-                entity.Property(e => e.CitySetDate).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.CreateStoreDate).HasColumnType("datetime");
-
-                entity.Property(e => e.DeviceId)
-                    .HasColumnType("varchar(128)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.DeviceToken)
-                    .HasColumnType("varchar(64)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.DeviceType)
-                    .HasColumnType("varchar(30)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.ExpiredDate).HasColumnType("datetime");
-
-                entity.Property(e => e.GroupId)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.HandCertImage)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.HandPwd)
-                    .HasColumnType("varchar(32)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.HeadPhoto)
-                    .HasColumnType("varchar(2000)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.HelpProfitAgree)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.HelpProfitAgreeDate).HasColumnType("datetime");
-
-                entity.Property(e => e.IdCardEndNo)
-                    .HasColumnType("varchar(4)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.IsNewUser)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.IsSign)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.LeaderLevel).HasColumnType("int(11)");
-
-                entity.Property(e => e.LockStatus)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.LoginPwd)
-                    .HasColumnType("varchar(32)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.LoginStatus).HasColumnType("int(11)");
-
-                entity.Property(e => e.MakerCode)
-                    .HasColumnType("varchar(32)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.MerchantDate).HasColumnType("datetime");
-
-                entity.Property(e => e.MerchantType).HasColumnType("int(11)");
-
-                entity.Property(e => e.Mobile)
-                    .HasColumnType("varchar(15)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.NickName)
-                    .HasColumnType("varchar(300)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.OpenId)
-                    .HasColumnType("varchar(50)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.ParentNav)
-                    .HasColumnType("longtext")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.ParentUserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.PayPwd)
-                    .HasColumnType("varchar(32)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.ProfitRewardRate).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
-
-                entity.Property(e => e.RealName)
-                    .HasColumnType("varchar(30)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.ReferenceCode)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.ReferenceQrCode)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.ReferralUserId).HasColumnType("int(11)");
-
-                entity.Property(e => e.Remark)
-                    .HasColumnType("mediumtext")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.RiskFlag)
-                    .HasColumnType("bit(1)")
-                    .HasDefaultValueSql("b'0'");
-
-                entity.Property(e => e.RiskRemark)
-                    .HasColumnType("varchar(64)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.RreezeRemark)
-                    .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.SettleAmount).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.SettleBankCardName)
-                    .HasColumnType("varchar(20)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SettleBankCardNo)
-                    .HasColumnType("varchar(32)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SettleBankName)
-                    .HasColumnType("varchar(32)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SettleRemark)
-                    .HasColumnType("varchar(64)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.Sex).HasColumnType("int(11)");
-
-                entity.Property(e => e.SignDate).HasColumnType("datetime");
-
-                entity.Property(e => e.SignImgUrl)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.SignPic)
-                    .HasColumnType("varchar(200)")
-                    .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.StoreStock).HasColumnType("int(11)");
-
-                entity.Property(e => e.Tags)
-                    .HasColumnType("varchar(200)")
-                    .HasCharSet("utf8")
-                    .HasCollation("utf8_general_ci");
-
-                entity.Property(e => e.ThisMonthSend).HasColumnType("int(11)");
-
-                entity.Property(e => e.ThisMonthTrade).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.UserLevel).HasColumnType("int(11)");
-
-                entity.Property(e => e.UserProperty).HasColumnType("int(11)");
-
-                entity.Property(e => e.UserType).HasColumnType("int(11)");
-
-                entity.Property(e => e.ValidAmount).HasColumnType("decimal(18,2)");
-
-                entity.Property(e => e.Version).HasColumnType("int(11)");
-            });
-
             OnModelCreatingPartial(modelBuilder);
         }
 

MainModels2/MerchantAddInfo.cs

@@ -144,5 +144,6 @@ namespace MySystem.MainModels2
         public string OutMchtNo { get; set; }
         public string AliMerchantId { get; set; }
         public string WeChatMerchantId { get; set; }
+        public int HdStatus { get; set; }
     }
 }

MainModels2/MerchantInfo.cs

@@ -43,5 +43,7 @@ namespace MySystem.MainModels2
         public int ActStat { get; set; }
         public DateTime? SignDate { get; set; }
         public decimal AllocationAmount { get; set; }
+        public decimal ActMaxAmount { get; set; }
+        public decimal ActCurrentAmount { get; set; }
     }
 }

MainModels2/MerchantTradeSummary.cs

@@ -17,14 +17,14 @@ namespace MySystem.MainModels2
         public string SeoTitle { get; set; }
         public string SeoKeyword { get; set; }
         public string SeoDescription { get; set; }
+        public decimal AliPayInFactAmount { get; set; }
+        public decimal WeChatInfactAmount { get; set; }
         public int OderCount { get; set; }
         public decimal InFactAmount { get; set; }
         public decimal TradeAmount { get; set; }
         public string TradeDate { get; set; }
         public string TradeMonth { get; set; }
         public int MerchantId { get; set; }
-        public decimal AliPayInFactAmount { get; set; }
-        public decimal WeChatInfactAmount { get; set; }
         public decimal ActAmount { get; set; }
         public decimal NonActAmount { get; set; }
     }

MainModels2/WebCMSEntities.cs

@@ -5308,7 +5308,7 @@ namespace MySystem.MainModels2
                     .HasCollation("utf8_general_ci");
 
                 entity.Property(e => e.BizStoreAddress)
-                    .HasColumnType("varchar(50)")
+                    .HasColumnType("varchar(100)")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
@@ -5421,6 +5421,10 @@ namespace MySystem.MainModels2
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.HdStatus)
+                    .HasColumnType("int(11)")
+                    .HasComment("好哒进件状态");
+
                 entity.Property(e => e.HoldAgentProtocol)
                     .HasColumnName("holdAgentProtocol")
                     .HasColumnType("varchar(200)")
@@ -6503,6 +6507,14 @@ namespace MySystem.MainModels2
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.ActCurrentAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("活动已返金额");
+
+                entity.Property(e => e.ActMaxAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("活动应返金额");
+
                 entity.Property(e => e.ActStat)
                     .HasColumnType("int(11)")
                     .HasComment("激活统计标记");

Services/MerchantAccountLinkInfoService.cs

@@ -41,7 +41,7 @@ namespace MySystem
                 if(item.Kind == 1)
                 {
                     var merchant = new MerchantAddInfoService().Query(item.MerchantId);
-                    if(merchant.Status == 2 || merchant.QueryCount == 2)
+                    if(merchant.Status >= 1 || merchant.QueryCount >= 1)
                     {
                         row.Add("MerchantId", merchant.Id);
                         row.Add("MerchantName", merchant.CertMerchantName);
@@ -52,7 +52,7 @@ namespace MySystem
                 else
                 {
                     var merchant = new MerchantAddInfo2Service().Query(item.MerchantId);
-                    if(merchant.Status == 2 || merchant.QueryCount == 2)
+                    if(merchant.HdStatus > 0)
                     {
                         row.Add("MerchantId", merchant.Id);
                         row.Add("MerchantName", merchant.CertMerchantName);