推荐王数据逻辑更改

AppStart/Helper/RecommandKingHelper.cs

@@ -37,29 +37,38 @@ namespace MySystem
 
                         if(DateTime.Now.Day == 2)
                         {
-                            Recommend(DateTime.Now.AddMonths(-1).ToString("yyyyMM"));
+                            Recommend(DateTime.Now.AddMonths(-1).ToString("yyyyMM"), 1);
+                            Recommend(DateTime.Now.AddMonths(-1).ToString("yyyyMM"), 2);
                         }
-                        Recommend(DateTime.Now.ToString("yyyyMM"));
+                        Recommend(DateTime.Now.ToString("yyyyMM"), 1);
+                        Recommend(DateTime.Now.ToString("yyyyMM"), 2);
                     }
                 }
                 Thread.Sleep(600000);
             }
         }
-        public void Recommend(string TradeMonth)
+        public void Recommend(string TradeMonth, int Kind)
         {
+            int CheckCount = 0;
+            if(Kind == 1) CheckCount = 40;
+            if(Kind == 2) CheckCount = 50;
             List<int> ReduceUserId = new List<int>();
             WebCMSEntities db = new WebCMSEntities();
             List<RecommendDirectUser> list = new List<RecommendDirectUser>();
-            List<int> Historys = db.RecommendDirectUser.Where(m => m.QueryCount >= 50 && m.TradeMonth != TradeMonth).ToList().Select(m => m.UserId).ToList();
-            Historys.Add(565);
-            Historys.Add(139473);
-            Historys.Add(173790);
-            Historys.Add(174506);
-            Historys.Add(127023);
+            List<int> Historys = new List<int>();
+            if(Kind == 1)
+            {
+                Historys = db.RecommendDirectUser.Where(m => m.QueryCount >= CheckCount && m.TradeMonth != TradeMonth && m.Kind == Kind).ToList().Select(m => m.UserId).ToList();
+                Historys.Add(565);
+                Historys.Add(139473);
+                Historys.Add(173790);
+                Historys.Add(174506);
+                Historys.Add(127023);
+            }
             DateTime check = DateTime.Parse("2023-10-01 00:00:00");
             DateTime start = DateTime.Parse(TradeMonth.Substring(0, 4) + "-" + TradeMonth.Substring(4, 2) + "-01 00:00:00");
             DateTime end = start.AddMonths(1);
-            CustomerSqlConn.op("delete from RecommendDirectUser where TradeMonth='" + TradeMonth + "'", MysqlConn.SqlConnStr);
+            CustomerSqlConn.op("delete from RecommendDirectUser where TradeMonth='" + TradeMonth + "' and Kind=" + Kind, MysqlConn.SqlConnStr);
             List<int> ProductIds = new List<int>();
             ProductIds.Add(10);
             ProductIds.Add(11);
@@ -181,7 +190,7 @@ namespace MySystem
                 foreach(RecommandKingItem sub in subs)
                 {
                     function.WriteLog(sub.UserId + ":" + sub.ActCount, "推荐王最终的达标创客数量分析");
-                    if(sub.ActCount < 50 && sub.UserLevel < 5 && !Historys.Contains(sub.UserId))
+                    if(sub.ActCount < CheckCount && sub.UserLevel < 5 && !Historys.Contains(sub.UserId))
                     {
                         ActCount += sub.ActCount;
                         if(sub.Op) ActCount += 1;
@@ -197,7 +206,7 @@ namespace MySystem
                 if(!Historys.Contains(user.UserId))
                 {
                     num += 1;
-                    RecommendDirectUser item = db.RecommendDirectUser.FirstOrDefault(m => m.UserId == user.UserId && m.TradeMonth == TradeMonth);
+                    RecommendDirectUser item = db.RecommendDirectUser.FirstOrDefault(m => m.UserId == user.UserId && m.TradeMonth == TradeMonth && m.Kind == Kind);
                     if(item == null)
                     {
                         function.WriteLog(user.UserId.ToString(), "推荐王达标最终入库");
@@ -205,7 +214,8 @@ namespace MySystem
                         {
                             UserId = user.UserId,
                             TradeMonth = TradeMonth,
-                            QueryCount = user.ActCount > 50 ? 50 : user.ActCount,
+                            QueryCount = user.ActCount > CheckCount ? CheckCount : user.ActCount,
+                            Kind = Kind,
                         }).Entity;
                         if(num % 200 == 0)
                         {

PxcModels/ApiUrlRewrite.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class ApiUrlRewrite
+    {
+        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 UrlPath { get; set; }
+        public int QueryCount { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+    }
+}

PxcModels/JavaApiSet.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class JavaApiSet
+    {
+        public int Id { get; set; }
+        public string ToApiHost { get; set; }
+        public string ToApiUrl { get; set; }
+        public string SourceApiUrl { get; set; }
+        public string ApiName { get; set; }
+    }
+}

PxcModels/JavaApiSetFields.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class JavaApiSetFields
+    {
+        public int Id { get; set; }
+        public string TargetFieldType { get; set; }
+        public string TargetFieldName { get; set; }
+        public string SourceFieldTitle { get; set; }
+        public string SourceFieldName { get; set; }
+        public int ApiId { get; set; }
+    }
+}

PxcModels/LeaderReserveRecord.cs

@@ -25,5 +25,7 @@ namespace MySystem.PxcModels
         public string TradeMonth { get; set; }
         public int UserId { get; set; }
         public int AccountRecordId { get; set; }
+        public decimal UsedReserve { get; set; }
+        public int SmallLeaderUserId { get; set; }
     }
 }

PxcModels/Leaders.cs

@@ -18,5 +18,6 @@ namespace MySystem.PxcModels
         public int UserId { get; set; }
         public DateTime? ExpiredDate { get; set; }
         public DateTime? LastBuyDate { get; set; }
+        public int BusinessFlag { get; set; }
     }
 }

PxcModels/LiShuaFeeSetRecord.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class LiShuaFeeSetRecord
+    {
+        public int Id { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string TradeFeeAmt { get; set; }
+        public string TradeFeeRate { get; set; }
+        public string MerNo { get; set; }
+        public int MerId { get; set; }
+        public string PosSn { get; set; }
+        public int PosId { get; set; }
+    }
+}

PxcModels/NewLeaderData.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class NewLeaderData
+    {
+        public int UserId { get; set; }
+        public decimal BalanceAmount { get; set; }
+        public decimal ReserveAmount { get; set; }
+    }
+}

PxcModels/PosChannelSet.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PosChannelSet
+    {
+        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 SnCount { get; set; }
+        public int BrandId { get; set; }
+        public string ChannelNo { get; set; }
+        public int UserId { get; set; }
+        public int Kind { get; set; }
+    }
+}

PxcModels/PosChannelSetRecord.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PosChannelSetRecord
+    {
+        public int Id { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public int MerId { get; set; }
+        public int PosId { get; set; }
+        public string ChannelNo { get; set; }
+        public string MerNo { get; set; }
+        public string PosSn { get; set; }
+        public int BrandId { get; set; }
+        public int RecordId { get; set; }
+    }
+}

PxcModels/PosCouponExchangeRecord.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PosCouponExchangeRecord
+    {
+        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 Note { get; set; }
+        public int ToCount { get; set; }
+        public int SourceCount { get; set; }
+        public string ToCoupons { get; set; }
+        public string SourceCoupons { get; set; }
+        public int UserId { get; set; }
+        public int QueryCount { 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/PosCoupons.cs

@@ -25,5 +25,6 @@ namespace MySystem.PxcModels
         public ulong HelpProfitFlag { get; set; }
         public int OpId { get; set; }
         public int OrderId { get; set; }
+        public int OpenPrizeUserId { get; set; }
     }
 }

PxcModels/PosFeeWarningRecord.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PosFeeWarningRecord
+    {
+        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 SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public decimal DownFee { get; set; }
+        public ulong DownFeeFlag { get; set; }
+        public ulong UpFeeFlag { get; set; }
+        public string TradeFeeAmt { get; set; }
+        public string TradeFeeRate { get; set; }
+        public string PosSn { get; set; }
+        public int BrandId { get; set; }
+        public int PosId { get; set; }
+        public int QueryCount { get; set; }
+        public DateTime? DoDate { get; set; }
+    }
+}

PxcModels/PosMachineOther.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PosMachineOther
+    {
+        public int Id { get; set; }
+        public string CustomerNo { get; set; }
+        public string LeMerNo { get; set; }
+        public string LeMerNo4 { get; set; }
+        public int LeMerchantId { get; set; }
+    }
+}

PxcModels/PrizeFlowRecord.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PrizeFlowRecord
+    {
+        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 Detail { get; set; }
+        public string CodeNumber { get; set; }
+        public int Kind { get; set; }
+        public int QueryCount { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+    }
+}

PxcModels/RecommendDirectUser.cs

@@ -17,5 +17,6 @@ namespace MySystem.PxcModels
         public string TradeMonth { get; set; }
         public int DirectUserId { get; set; }
         public int UserId { get; set; }
+        public int Kind { get; set; }
     }
 }

PxcModels/StoreHouse.cs

@@ -43,5 +43,6 @@ namespace MySystem.PxcModels
         public string FilePath { get; set; }
         public decimal Deposit { get; set; }
         public int OpId { get; set; }
+        public int ApplyNum { get; set; }
     }
 }

PxcModels/ToChargeBackRecord.cs

@@ -23,5 +23,6 @@ namespace MySystem.PxcModels
         public int TimeNumber { get; set; }
         public DateTime? StartDate { get; set; }
         public int Kind { get; set; }
+        public ulong LockFlag { get; set; }
     }
 }

PxcModels/TradeFilterRecord.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class TradeFilterRecord
+    {
+        public int Id { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public decimal IntercetpAmount { get; set; }
+        public DateTime? OrderDate { get; set; }
+        public string OrderNo { get; set; }
+        public int OrderId { get; set; }
+        public int PrizeUserId { get; set; }
+        public int OrderUserId { get; set; }
+        public int Kind { get; set; }
+    }
+}

PxcModels/TradeRecord.cs

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

PxcModels/UpUserRelation.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class UpUserRelation
+    {
+        public int UserId { get; set; }
+        public int Floor { get; set; }
+        public int UpUserId { get; set; }
+    }
+}

PxcModels/UserRankWhiteSetRecord.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class UserRankWhiteSetRecord
+    {
+        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 BeforeLevel { get; set; }
+        public DateTime? ExpireDate { get; set; }
+        public DateTime? PresetDate { get; set; }
+        public string OperateMan { get; set; }
+        public int Level { get; set; }
+        public int SetType { get; set; }
+        public int UserId { get; set; }
+        public int UserType { get; set; }
+        public string Remark { get; set; }
+    }
+}

PxcModels/UserSetUnAuthRecord.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class UserSetUnAuthRecord
+    {
+        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 Remark { get; set; }
+        public string Operator { get; set; }
+        public string MakerCode { get; set; }
+        public string RealName { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/Users.cs

@@ -97,5 +97,6 @@ namespace MySystem.PxcModels
         public string BusinessLogo { get; set; }
         public string BusinessName { get; set; }
         public DateTime? LogOutDate { get; set; }
+        public int LimitPosCount { get; set; }
     }
 }

PxcModels/WifiTradeRecord.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class WifiTradeRecord
+    {
+        public int Id { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string Remark { get; set; }
+        public int BrandId { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string SnNo { get; set; }
+    }
+}

appsettings.Development.json

@@ -41,4 +41,4 @@
     "MqPassword": "skb@rabbitmq",
     "MqHostName": "47.108.231.170:5672,47.108.225.92:5672"
   }
-}
+}