增加签约时间

AppStart/Helper/CheckAlipaySignService.cs

@@ -105,6 +105,10 @@ namespace MySystem
                                     if (merchant != null)
                                     {
                                         merchant.QueryCount = 2;
+                                        if(merchant.SignDate == null)
+                                        {
+                                            merchant.SignDate = DateTime.Now;
+                                        }
                                     }
                                 }
                             }
@@ -115,6 +119,10 @@ namespace MySystem
                                 if (merchant != null)
                                 {
                                     merchant.QueryCount = 2;
+                                    if(merchant.SignDate == null)
+                                    {
+                                        merchant.SignDate = DateTime.Now;
+                                    }
                                 }
                             }
                             db.SaveChanges();

AppStart/Helper/CheckWeChatSignService.cs

@@ -96,6 +96,10 @@ namespace MySystem
                         if (merchant != null)
                         {
                             merchant.Status = 2;
+                            if(merchant.SignDate == null)
+                            {
+                                merchant.SignDate = DateTime.Now;
+                            }
                         }
                         db.SaveChanges();
                     }

Models/ConsumerOrders.cs

@@ -28,5 +28,6 @@ namespace MySystem.Models
         public int MerchantId { get; set; }
         public ulong IsAct { get; set; }
         public int UserId { get; set; }
+        public decimal MerchantActualAmount { get; set; }
     }
 }

Models/MerchantDiviSummay.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class MerchantDiviSummay
+    {
+        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 decimal DiviAmount { get; set; }
+        public decimal TotalDiviAmount { get; set; }
+        public int MerchantId { get; set; }
+        public string TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+    }
+}

Models/MerchantInfo.cs

@@ -40,5 +40,7 @@ namespace MySystem.Models
         public int ActivationStatus { get; set; }
         public decimal TotalActActual { get; set; }
         public decimal TotalActAmount { get; set; }
+        public int ActStat { get; set; }
+        public DateTime? SignDate { get; set; }
     }
 }

Models/WebCMSEntities.cs

@@ -90,6 +90,7 @@ namespace MySystem.Models
         public virtual DbSet<MerchantComment> MerchantComment { get; set; }
         public virtual DbSet<MerchantDepositReturns> MerchantDepositReturns { get; set; }
         public virtual DbSet<MerchantDepositSet> MerchantDepositSet { get; set; }
+        public virtual DbSet<MerchantDiviSummay> MerchantDiviSummay { get; set; }
         public virtual DbSet<MerchantForCode> MerchantForCode { get; set; }
         public virtual DbSet<MerchantForMobile> MerchantForMobile { get; set; }
         public virtual DbSet<MerchantForName> MerchantForName { get; set; }
@@ -2120,6 +2121,10 @@ namespace MySystem.Models
 
                 entity.Property(e => e.MaxDivi).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.MerchantActualAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("商家实收");
+
                 entity.Property(e => e.MerchantId).HasColumnType("int(11)");
 
                 entity.Property(e => e.OrderNo)
@@ -2173,6 +2178,9 @@ namespace MySystem.Models
 
             modelBuilder.Entity<ConsumerProfit>(entity =>
             {
+                entity.HasIndex(e => new { e.MerchantId, e.OrderId, e.CreateDate })
+                    .HasName("ConsumerProfitIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.ConsumerId).HasColumnType("int(11)");
@@ -5877,6 +5885,88 @@ namespace MySystem.Models
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<MerchantDiviSummay>(entity =>
+            {
+                entity.HasComment("商家分红统计");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("创建人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.DiviAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("已分金额");
+
+                entity.Property(e => e.MerchantId)
+                    .HasColumnType("int(11)")
+                    .HasComment("商家");
+
+                entity.Property(e => e.QueryCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("点击量");
+
+                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)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.TotalDiviAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("分红总额");
+
+                entity.Property(e => e.TradeDate)
+                    .HasColumnType("varchar(8)")
+                    .HasComment("日期")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasComment("月份")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("更新人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<MerchantForCode>(entity =>
             {
                 entity.HasKey(e => e.Code)
@@ -5920,6 +6010,10 @@ namespace MySystem.Models
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
+                entity.Property(e => e.ActStat)
+                    .HasColumnType("int(11)")
+                    .HasComment("激活统计标记");
+
                 entity.Property(e => e.ActivationDate).HasColumnType("datetime");
 
                 entity.Property(e => e.ActivationStatus).HasColumnType("int(11)");
@@ -5995,6 +6089,10 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.SignDate)
+                    .HasColumnType("datetime")
+                    .HasComment("微信确认签约时间");
+
                 entity.Property(e => e.Sort).HasColumnType("int(11)");
 
                 entity.Property(e => e.Status).HasColumnType("int(11)");