减去注销的广电卡换表

AppStart/Helper/LeaderCompPrizeHelper.cs

@@ -113,6 +113,10 @@ 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;
+                        if(db.UserSimActSummary.Any(m => m.UserId == UserId && m.Kind == 1))
+                        {
+                            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;

AppStart/Helper/RecommandKingHelper.cs

@@ -75,7 +75,10 @@ namespace MySystem
                     if(readdb.UserTradeMonthSummary.Any(m => m.UserId == uid && m.TradeMonth == TradeMonth && m.SeoTitle == "team"))
                     {
                         ActCount += readdb.UserTradeMonthSummary.Where(m => m.UserId == uid && m.TradeMonth == TradeMonth && m.SeoTitle == "team").Sum(m => m.ActiveBuddyMerStatus);
-                        ActCount -= readdb.SimposMerchantInfo.Count(m => m.UserId == uid && m.Status < 0); //减去注销的用户
+                        if(readdb.UserSimActSummary.Any(m => m.UserId == uid && m.Kind == 1))
+                        {
+                            ActCount -= readdb.UserSimActSummary.Where(m => m.UserId == uid && m.Kind == 1).Sum(m => m.ActCount); //减去注销的用户
+                        }
                     }
                 }
                 if(ActCount == 0)

PxcModels/AdminMoveInfo.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class AdminMoveInfo
+    {
+        public int UserId { get; set; }
+        public DateTime? UpdateTime { get; set; }
+        public string LoginPwd { get; set; }
+    }
+}

PxcModels/ChangeTypeKind.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ChangeTypeKind
+    {
+        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 string Name { get; set; }
+        public string Operator { get; set; }
+    }
+}

PxcModels/ChangeTypes.cs

@@ -16,5 +16,6 @@ namespace MySystem.PxcModels
         public string SeoDescription { get; set; }
         public string Name { get; set; }
         public int Kind { get; set; }
+        public int TypeId { get; set; }
     }
 }

PxcModels/CustomQuery.cs

@@ -20,5 +20,7 @@ namespace MySystem.PxcModels
         public string AdminNames { get; set; }
         public string Title { get; set; }
         public string SqlContent { get; set; }
+        public int ExcuteFlag { get; set; }
+        public string DatabaseConnect { get; set; }
     }
 }

PxcModels/CustomQuerySub.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class CustomQuerySub
+    {
+        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 Alias { get; set; }
+        public int Kind { get; set; }
+        public int ParentId { get; set; }
+        public string SqlContent { get; set; }
+        public string AdminNames { get; set; }
+        public string Title { get; set; }
+        public string DatabaseConnect { get; set; }
+        public string DataKey { get; set; }
+        public string DataText { get; set; }
+    }
+}

PxcModels/LeaderReserveRecord.cs

@@ -24,5 +24,6 @@ namespace MySystem.PxcModels
         public string TradeDate { get; set; }
         public string TradeMonth { get; set; }
         public int UserId { get; set; }
+        public int AccountRecordId { get; set; }
     }
 }

PxcModels/ProfitRewardExport.cs

@@ -39,5 +39,25 @@ namespace MySystem.PxcModels
         public decimal ProfitCreditTradeAmt { get; set; }
         public decimal ProfitCreditTradeProfit2 { get; set; }
         public decimal ProfitCreditTradeAmt2 { get; set; }
+        public decimal ProfitCreditTradeProfit2Before { get; set; }
+        public decimal ProfitCreditTradeAmt2Before { get; set; }
+        public decimal ProfitCreditTradeProfitBefore { get; set; }
+        public decimal ProfitCreditTradeAmtBefore { get; set; }
+        public decimal DebitTradeProfitBefore { get; set; }
+        public decimal DebitTradeAmtBefore { get; set; }
+        public decimal NotHelpCreditTradeProfitBefore { get; set; }
+        public decimal NotHelpCreditTradeAmtBefore { get; set; }
+        public decimal HelpCreditTradeProfitBefore { get; set; }
+        public decimal HelpCreditTradeAmtBefore { get; set; }
+        public decimal NonQrCreditTradeProfitBefore { get; set; }
+        public decimal NonQrCreditTradeAmtBefore { get; set; }
+        public decimal QrCreditTradeProfitBefore { get; set; }
+        public decimal QrCreditTradeAmtBefore { get; set; }
+        public decimal CreditTradeProfitBefore { get; set; }
+        public decimal CreditTradeAmtBefore { get; set; }
+        public int BeforeRank { get; set; }
+        public int LeaderRank { get; set; }
+        public int OperateRank { get; set; }
+        public int MaxRank { get; set; }
     }
 }

PxcModels/RadioCardInfo.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class RadioCardInfo
+    {
+        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 UserId { get; set; }
+        public string BrhUserId { get; set; }
+        public string BrhName { get; set; }
+        public string OpenTime { get; set; }
+        public string OprInviteCode { get; set; }
+        public string ProvincialCompany { get; set; }
+        public string ChannelName { get; set; }
+        public string ChannelCode { get; set; }
+        public string Role { get; set; }
+        public string Gender { get; set; }
+        public string IdNo { get; set; }
+        public string Mobile { get; set; }
+        public string OprName { get; set; }
+        public string JobStatus { get; set; }
+        public string JobId { get; set; }
+    }
+}

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; }
     }
 }

PxcModels/UserMoveInfo.cs

@@ -8,5 +8,6 @@ namespace MySystem.PxcModels
         public int UserId { get; set; }
         public string PayPwd { get; set; }
         public string LoginPwd { get; set; }
+        public DateTime? UpdateTime { get; set; }
     }
 }

PxcModels/UserRankWhiteBefore.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class UserRankWhiteBefore
+    {
+        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 int Rank { get; set; }
+        public int UserId { get; set; }
+    }
+}

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; }
+    }
+}

ReadModels/AdminMoveInfo.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.ReadModels
+{
+    public partial class AdminMoveInfo
+    {
+        public int UserId { get; set; }
+        public DateTime? UpdateTime { get; set; }
+        public string LoginPwd { get; set; }
+    }
+}

ReadModels/ChangeTypeKind.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.ReadModels
+{
+    public partial class ChangeTypeKind
+    {
+        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 string Name { get; set; }
+        public string Operator { get; set; }
+    }
+}

ReadModels/ChangeTypes.cs

@@ -16,5 +16,6 @@ namespace MySystem.ReadModels
         public string SeoDescription { get; set; }
         public string Name { get; set; }
         public int Kind { get; set; }
+        public int TypeId { get; set; }
     }
 }

ReadModels/CustomQuery.cs

@@ -20,5 +20,7 @@ namespace MySystem.ReadModels
         public string AdminNames { get; set; }
         public string Title { get; set; }
         public string SqlContent { get; set; }
+        public int ExcuteFlag { get; set; }
+        public string DatabaseConnect { get; set; }
     }
 }

ReadModels/CustomQuerySub.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.ReadModels
+{
+    public partial class CustomQuerySub
+    {
+        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 Alias { get; set; }
+        public int Kind { get; set; }
+        public int ParentId { get; set; }
+        public string SqlContent { get; set; }
+        public string AdminNames { get; set; }
+        public string Title { get; set; }
+        public string DatabaseConnect { get; set; }
+        public string DataKey { get; set; }
+        public string DataText { get; set; }
+    }
+}

ReadModels/LeaderReserveRecord.cs

@@ -24,5 +24,6 @@ namespace MySystem.ReadModels
         public string TradeDate { get; set; }
         public string TradeMonth { get; set; }
         public int UserId { get; set; }
+        public int AccountRecordId { get; set; }
     }
 }

ReadModels/ProfitRewardExport.cs

@@ -39,5 +39,25 @@ namespace MySystem.ReadModels
         public decimal ProfitCreditTradeAmt { get; set; }
         public decimal ProfitCreditTradeProfit2 { get; set; }
         public decimal ProfitCreditTradeAmt2 { get; set; }
+        public decimal ProfitCreditTradeProfit2Before { get; set; }
+        public decimal ProfitCreditTradeAmt2Before { get; set; }
+        public decimal ProfitCreditTradeProfitBefore { get; set; }
+        public decimal ProfitCreditTradeAmtBefore { get; set; }
+        public decimal DebitTradeProfitBefore { get; set; }
+        public decimal DebitTradeAmtBefore { get; set; }
+        public decimal NotHelpCreditTradeProfitBefore { get; set; }
+        public decimal NotHelpCreditTradeAmtBefore { get; set; }
+        public decimal HelpCreditTradeProfitBefore { get; set; }
+        public decimal HelpCreditTradeAmtBefore { get; set; }
+        public decimal NonQrCreditTradeProfitBefore { get; set; }
+        public decimal NonQrCreditTradeAmtBefore { get; set; }
+        public decimal QrCreditTradeProfitBefore { get; set; }
+        public decimal QrCreditTradeAmtBefore { get; set; }
+        public decimal CreditTradeProfitBefore { get; set; }
+        public decimal CreditTradeAmtBefore { get; set; }
+        public int BeforeRank { get; set; }
+        public int LeaderRank { get; set; }
+        public int OperateRank { get; set; }
+        public int MaxRank { get; set; }
     }
 }

ReadModels/RadioCardInfo.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.ReadModels
+{
+    public partial class RadioCardInfo
+    {
+        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 UserId { get; set; }
+        public string BrhUserId { get; set; }
+        public string BrhName { get; set; }
+        public string OpenTime { get; set; }
+        public string OprInviteCode { get; set; }
+        public string ProvincialCompany { get; set; }
+        public string ChannelName { get; set; }
+        public string ChannelCode { get; set; }
+        public string Role { get; set; }
+        public string Gender { get; set; }
+        public string IdNo { get; set; }
+        public string Mobile { get; set; }
+        public string OprName { get; set; }
+        public string JobStatus { get; set; }
+        public string JobId { get; set; }
+    }
+}

ReadModels/RefreshTokens.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.ReadModels
+{
+    public partial class RefreshTokens
+    {
+        public string RefreshToken { get; set; }
+        public DateTime? ExpiredDate { get; set; }
+        public string UserName { get; set; }
+    }
+}

ReadModels/TradeRecord.cs

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

ReadModels/UserMoveInfo.cs

@@ -8,5 +8,6 @@ namespace MySystem.ReadModels
         public int UserId { get; set; }
         public string PayPwd { get; set; }
         public string LoginPwd { get; set; }
+        public DateTime? UpdateTime { get; set; }
     }
 }

ReadModels/UserRankWhiteBefore.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.ReadModels
+{
+    public partial class UserRankWhiteBefore
+    {
+        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 int Rank { get; set; }
+        public int UserId { get; set; }
+    }
+}

ReadModels/UserSimActSummary.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.ReadModels
+{
+    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; }
+    }
+}

Startup.cs

@@ -166,6 +166,7 @@ namespace MySystem
             // }
             // if(Library.ConfigurationManager.EnvironmentFlag == 2)
             // {
+                LeaderCompPrizeHelper.Instance.Start(); //领导人达标奖
                 RecommandKingHelper.Instance.Start(); //推荐王
                 AddSourcePosSnHelper.Instance.Start(); //补来源机具
             // }