Browse Source

领导人达标奖励排除注销的广电卡

lcl 1 year ago
parent
commit
78051b6ad5

+ 1 - 0
AppStart/Helper/LeaderCompPrizeHelper.cs

@@ -113,6 +113,7 @@ namespace MySystem
                     if (check)
                     {
                         TradeAmount += db.UserTradeMonthSummary.Where(m => m.UserId == UserId && m.TradeMonth == month && m.SeoTitle == "team" && m.BrandId == 14).Sum(m => m.ActiveBuddyMerStatus) * 10000;
+                        TradeAmount -= db.UserSimActSummary.Where(m => m.UserId == UserId && m.Kind == 1).Sum(m => m.ActCount) * 10000;
                     }
                     sql += "insert into LeaderCompTradeStat (CreateDate,UserId,StatMonth,TradeAmount) values (now(), " + UserId + ", '" + month + "-" + checkMonth + "', " + TradeAmount + ");\n";
                     num += 1;

+ 1 - 0
PxcModels/TradeRecord.cs

@@ -41,5 +41,6 @@ namespace MySystem.PxcModels
         public int PayType { get; set; }
         public int VipFlag { get; set; }
         public int ActStatus { get; set; }
+        public int StatStatus { get; set; }
     }
 }

+ 18 - 0
PxcModels/UserSimActSummary.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class UserSimActSummary
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public int ActCount { get; set; }
+        public int UserId { get; set; }
+        public int Kind { get; set; }
+    }
+}

+ 44 - 0
PxcModels/WebCMSEntities.cs

@@ -290,6 +290,7 @@ namespace MySystem.PxcModels
         public virtual DbSet<UserRankWhite> UserRankWhite { get; set; }
         public virtual DbSet<UserRankWhiteBefore> UserRankWhiteBefore { get; set; }
         public virtual DbSet<UserRebateDetail> UserRebateDetail { get; set; }
+        public virtual DbSet<UserSimActSummary> UserSimActSummary { get; set; }
         public virtual DbSet<UserSnActInfo> UserSnActInfo { get; set; }
         public virtual DbSet<UserSnDelayChange> UserSnDelayChange { get; set; }
         public virtual DbSet<UserStoreChange> UserStoreChange { get; set; }
@@ -17824,6 +17825,10 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.Sort).HasColumnType("int(11)");
 
+                entity.Property(e => e.StatStatus)
+                    .HasColumnType("int(11)")
+                    .HasComment("统计标记");
+
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
                 entity.Property(e => e.TopUserId).HasColumnType("int(11)");
@@ -20271,6 +20276,45 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<UserSimActSummary>(entity =>
+            {
+                entity.HasComment("广电卡激活数统计");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.ActCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("激活数");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.Kind)
+                    .HasColumnType("int(11)")
+                    .HasComment("类型");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<UserSnActInfo>(entity =>
             {
                 entity.HasComment("机具激活限制信息");