Browse Source

重跑wifi交易数据

lcl 8 months ago
parent
commit
78c964b7be

+ 8 - 2
AppStart/Helper/SycnSpServer/SycnSpTradeWifiService.cs

@@ -39,9 +39,11 @@ namespace MySystem
                         if (!check)
                         {
                             decimal TradeAmount = trade.TradeAmount / 100;
+                            bool statFlag = false;
                             PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == trade.TradeSnNo);
                             if (pos != null)
                             {
+                                statFlag = db.WifiTradeRecord.Any(m => m.SnNo == trade.TradeSnNo);
                                 PxcModels.WifiTradeRecord add = db.WifiTradeRecord.Add(new PxcModels.WifiTradeRecord()
                                 {
                                     CreateDate = trade.CreateDate,
@@ -85,8 +87,12 @@ namespace MySystem
                             {
                                 decimal TradeAmt = TradeAmount / Months;
                                 TradeAmt = PublicFunction.NumberFormat(TradeAmt);
-                                PxcModels.TradeDaySummary stat = db.TradeDaySummary.Where(m => m.UserId == pos.BuyUserId && m.BrandId == pos.BrandId).OrderByDescending(m => m.Id).FirstOrDefault() ?? new PxcModels.TradeDaySummary();
-                                string TradeMonth = string.IsNullOrEmpty(stat.TradeMonth) ? DateTime.Now.AddMonths(-1).ToString("yyyyMM") : stat.TradeMonth;
+                                string TradeMonth = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
+                                if(statFlag)
+                                {
+                                    PxcModels.TradeDaySummary stat = db.TradeDaySummary.Where(m => m.UserId == pos.BuyUserId && m.BrandId == pos.BrandId).OrderByDescending(m => m.Id).FirstOrDefault() ?? new PxcModels.TradeDaySummary();
+                                    TradeMonth = string.IsNullOrEmpty(stat.TradeMonth) ? DateTime.Now.AddMonths(-1).ToString("yyyyMM") : stat.TradeMonth;
+                                }
                                 DateTime StartMonth = DateTime.Parse(TradeMonth.Substring(0, 4) + "-" + TradeMonth.Substring(4, 2) + "-01 00:00:00");
                                 for (int i = 1; i <= Months; i++)
                                 {

+ 144 - 0
AppStart/Helper/SycnSpServer/SycnSpTradeWifiServiceTmp.cs

@@ -0,0 +1,144 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MySystem.ReadModels;
+using Library;
+using LitJson;
+using System.Threading;
+
+namespace MySystem
+{
+    public class SycnSpTradeWifiServiceTmp
+    {
+        public readonly static SycnSpTradeWifiServiceTmp Instance = new SycnSpTradeWifiServiceTmp();
+        private SycnSpTradeWifiServiceTmp()
+        { }
+
+        public void Start()
+        {
+            Thread th = new Thread(StartDo);
+            th.IsBackground = true;
+            th.Start();
+        }
+
+        public void StartDo()
+        {
+            while (true)
+            {
+                try
+                {
+                    WebCMSEntities db = new WebCMSEntities();
+                    DateTime start = DateTime.Parse("2024-08-01 00:00:00");
+                    List<WifiTradeRecord> trades = db.WifiTradeRecord.Where(m => m.CreateDate >= start).ToList();
+                    List<string> SnNos = trades.Select(m => m.SnNo).ToList();
+                    List<PosMachinesTwo> poslist = db.PosMachinesTwo.Where(m => SnNos.Contains(m.PosSn)).ToList();
+                    foreach(WifiTradeRecord trade in trades)
+                    {
+                        decimal TradeAmount = trade.TradeAmount;
+                        bool statFlag = false;
+                        PosMachinesTwo pos = poslist.FirstOrDefault(m => m.PosSn == trade.SnNo);
+                        if (pos != null)
+                        {
+                            statFlag = db.WifiTradeRecord.Count(m => m.SnNo == trade.SnNo) > 1;
+                        }
+
+                        //开始统计
+                        int Months = 0;
+
+                        if(pos.BrandId == 23 && TradeAmount == 49) Months = 1;
+                        if(pos.BrandId == 23 && TradeAmount == 79) Months = 3;
+                        if(pos.BrandId == 23 && TradeAmount == 119) Months = 12;
+                        if(pos.BrandId == 23 && TradeAmount == 199) Months = 24;
+
+                        if(pos.BrandId == 24 && TradeAmount == 59) Months = 1;
+                        if(pos.BrandId == 24 && TradeAmount == 159) Months = 3;
+                        if(pos.BrandId == 24 && TradeAmount == 399) Months = 12;
+                        if(pos.BrandId == 24 && TradeAmount == 699) Months = 24;
+
+                        if(pos.BrandId == 25 && TradeAmount == 69) Months = 1;
+                        if(pos.BrandId == 25 && TradeAmount == 199) Months = 3;
+                        if(pos.BrandId == 25 && TradeAmount == 499) Months = 12;
+                        if(pos.BrandId == 25 && TradeAmount == 799) Months = 24;
+
+                        if(pos.BrandId == 26 && TradeAmount == 219) Months = 1;
+                        if(pos.BrandId == 26 && TradeAmount == 449) Months = 3;
+                        if(pos.BrandId == 26 && TradeAmount == 1399) Months = 12;
+                        if(pos.BrandId == 26 && TradeAmount == 2698) Months = 24;
+
+                        if(Months > 0)
+                        {
+                            decimal TradeAmt = TradeAmount / Months;
+                            TradeAmt = PublicFunction.NumberFormat(TradeAmt);
+                            string TradeMonth = trade.CreateDate.Value.AddMonths(-1).ToString("yyyyMM");
+                            if(statFlag)
+                            {
+                                TradeDaySummary stat = db.TradeDaySummary.Where(m => m.UserId == pos.BuyUserId && m.BrandId == pos.BrandId).OrderByDescending(m => m.Id).FirstOrDefault() ?? new TradeDaySummary();
+                                TradeMonth = string.IsNullOrEmpty(stat.TradeMonth) ? trade.CreateDate.Value.AddMonths(-1).ToString("yyyyMM") : stat.TradeMonth;
+                            }
+                            DateTime StartMonth = DateTime.Parse(TradeMonth.Substring(0, 4) + "-" + TradeMonth.Substring(4, 2) + "-01 00:00:00");
+                            for (int i = 1; i <= Months; i++)
+                            {
+                                StartMonth = StartMonth.AddMonths(1);
+                                StatTrade(pos.BuyUserId, pos.BrandId, StartMonth.ToString("yyyyMM"), TradeAmt);
+                            }
+                        }
+                    }
+                    db.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "同步SP交易数据到MAIN异常");
+                }
+                Thread.Sleep(500);
+            }
+        }
+
+        public void StatTrade(int UserId, int BrandId, string TradeMonth, decimal TradeAmount)
+        {
+            PxcModels.WebCMSEntities db = new PxcModels.WebCMSEntities();
+            PxcModels.Users user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new PxcModels.Users();
+            string ParentNav = user.ParentNav;
+            string TradeDate = TradeMonth + "01";
+            ParentNav += "," + UserId + ",";
+
+            PxcModels.TradeDaySummary selfStat = db.TradeDaySummary.FirstOrDefault(m => m.UserId == UserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.SeoTitle == "self");
+            if (selfStat == null)
+            {
+                selfStat = db.TradeDaySummary.Add(new PxcModels.TradeDaySummary()
+                {
+                    UserId = UserId,
+                    TradeMonth = TradeMonth,
+                    TradeDate = TradeDate,
+                    BrandId = BrandId,
+                    SeoTitle = "self",
+                }).Entity;
+                db.SaveChanges();
+            }
+            selfStat.HelpDirectTradeAmt += TradeAmount;
+            if (!string.IsNullOrEmpty(ParentNav))
+            {
+                string[] ParentNavList = ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                foreach (string NavUserIdString in ParentNavList)
+                {
+                    int NavUserId = int.Parse(NavUserIdString);
+                    PxcModels.TradeDaySummary teamStat = db.TradeDaySummary.FirstOrDefault(m => m.UserId == NavUserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.SeoTitle == "team");
+                    if (teamStat == null)
+                    {
+                        teamStat = db.TradeDaySummary.Add(new PxcModels.TradeDaySummary()
+                        {
+                            UserId = NavUserId,
+                            TradeMonth = TradeMonth,
+                            TradeDate = TradeDate,
+                            BrandId = BrandId,
+                            SeoTitle = "team",
+                        }).Entity;
+                        db.SaveChanges();
+                    }
+                    teamStat.HelpNonDirectTradeAmt += TradeAmount;
+                    db.SaveChanges();
+                }
+            }
+            db.Dispose();
+        }
+    }
+}

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

+ 20 - 0
ReadModels/ApiUrlRewrite.cs

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

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

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

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

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

+ 14 - 0
ReadModels/JavaApiSet.cs

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

+ 15 - 0
ReadModels/JavaApiSetFields.cs

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

+ 3 - 0
ReadModels/LeaderReserveRecord.cs

@@ -24,5 +24,8 @@ namespace MySystem.ReadModels
         public string TradeDate { get; set; }
         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; }
     }
 }

+ 18 - 0
ReadModels/LiShuaFeeSetRecord.cs

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

+ 12 - 0
ReadModels/NewLeaderData.cs

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

+ 20 - 0
ReadModels/PosChannelSet.cs

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

+ 20 - 0
ReadModels/PosChannelSetRecord.cs

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

+ 27 - 0
ReadModels/PosCouponExchangeRecord.cs

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

+ 28 - 0
ReadModels/PosFeeWarningRecord.cs

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

+ 14 - 0
ReadModels/PosMachineOther.cs

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

+ 22 - 0
ReadModels/PrizeFlowRecord.cs

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

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

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

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

+ 1 - 0
ReadModels/ToChargeBackRecord.cs

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

+ 18 - 0
ReadModels/TradeFilterRecord.cs

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

+ 12 - 0
ReadModels/UpUserRelation.cs

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

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

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

+ 24 - 0
ReadModels/UserRankWhiteSetRecord.cs

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

+ 20 - 0
ReadModels/UserSetUnAuthRecord.cs

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

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

+ 1 - 0
ReadModels/Users.cs

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

File diff suppressed because it is too large
+ 655 - 10
ReadModels/WebCMSEntities.cs


+ 17 - 0
ReadModels/WifiTradeRecord.cs

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

+ 77 - 75
Startup.cs

@@ -168,92 +168,94 @@ namespace MySystem
             // }
             // if(Library.ConfigurationManager.EnvironmentFlag == 2)
             // {
-                SycnSpBindService.Instance.Start(); //同步SP绑定数据
-                SycnSpBindZkbService.Instance.Start(); //同步吱客宝SP绑定数据
-                SycnSpBindService.Instance.StartSim(); //同步SP广电卡绑定数据
-                SycnSpMerchantService.Instance.Start(); //同步SP商户数据
-                SycnSpActiveService.Instance.Start(); //同步SP激活数据
-                SycnSpTradeService.Instance.Start(); //同步SP交易数据
-                SycnSpTradeWifiService.Instance.Start(); //同步WIFISP交易数据
-                SycnSpTradeZkbService.Instance.Start(); //同步吱客宝SP交易数据
-                SycnSpTradeService.Instance.StartSim(); //同步SP广电卡交易数据
-                SycnSpTradeService.Instance.StartTradeStatus(); //恢复原始交易没有统计上的数据
-                SycnSpChangeBindService.Instance.Start(); //同步SP换绑数据
-                SycnSpUnBindService.Instance.Start(); //同步SP解绑数据
-                SycnSpMerchantRecordService.Instance.Start(); //同步SP商户记录数据 
+                // SycnSpBindService.Instance.Start(); //同步SP绑定数据
+                // SycnSpBindZkbService.Instance.Start(); //同步吱客宝SP绑定数据
+                // SycnSpBindService.Instance.StartSim(); //同步SP广电卡绑定数据
+                // SycnSpMerchantService.Instance.Start(); //同步SP商户数据
+                // SycnSpActiveService.Instance.Start(); //同步SP激活数据
+                // SycnSpTradeService.Instance.Start(); //同步SP交易数据
+                // SycnSpTradeWifiService.Instance.Start(); //同步WIFISP交易数据
+                // SycnSpTradeZkbService.Instance.Start(); //同步吱客宝SP交易数据
+                // SycnSpTradeService.Instance.StartSim(); //同步SP广电卡交易数据
+                // SycnSpTradeService.Instance.StartTradeStatus(); //恢复原始交易没有统计上的数据
+                // SycnSpChangeBindService.Instance.Start(); //同步SP换绑数据
+                // SycnSpUnBindService.Instance.Start(); //同步SP解绑数据
+                // SycnSpMerchantRecordService.Instance.Start(); //同步SP商户记录数据 
 
-                StatService.Instance.StartActiveReward(); //实时处理激活奖励
-                StatService.Instance.StartActiveReward1(); //实时处理0押激活奖励
-                StatService.Instance.StartActiveReward2(); //实时处理盒易付0押激活奖励
-                StatService.Instance.StartActiveReward15(); //实时处理来客吧0押激活奖励
-                StatService.Instance.StartSimActive(); //实时广电卡激活奖励
-                StatService.Instance.StartOpenReward(); //实时获取开机奖励
-                StatService.Instance.StartLeaderReward(); //盟主开机奖励发放
-                StatService.Instance.StartPreActPrize(); //押金奖励发放(激活奖励新规)
-                ActPrizeCheckService.Instance.Start(); //监听无商户号的机具,并再次发奖励
-                StatService.Instance.ListenFluxRecord(); //同步流量费
-                LeaderPrizeService.Instance.Start(); //大盟主奖励发奖
-                OperatePrizeService.Instance.Start(); //运营中心奖励发奖
-                ActRewardService.Instance.Start(); //发放激活奖励
-                ActRewardService.Instance.StartAfterAdd(); //补激活奖励
-                HelpProfitPreMerchantHelper.Instance.Start(); //助利宝每天增加指定数量商机
-                AddActService.Instance.Start(); //划拨后检查机具激活状态,并自动补录
-                PrePosRingService.Instance.Start(); //预发未申请提醒
-                PrePosWithholdService.Instance.Start(); //预发机过期未申请提交到预扣款
-                PrePosWithholdService.Instance.StartPre(); //预发机申请成功,处理预扣款
-                PosWithholdService.Instance.Start(); //过期机具激活,清理预扣款
-                SycnMerchantTradeService.Instance.Start(); //同步商户交易额 
+                // StatService.Instance.StartActiveReward(); //实时处理激活奖励
+                // StatService.Instance.StartActiveReward1(); //实时处理0押激活奖励
+                // StatService.Instance.StartActiveReward2(); //实时处理盒易付0押激活奖励
+                // StatService.Instance.StartActiveReward15(); //实时处理来客吧0押激活奖励
+                // StatService.Instance.StartSimActive(); //实时广电卡激活奖励
+                // StatService.Instance.StartOpenReward(); //实时获取开机奖励
+                // StatService.Instance.StartLeaderReward(); //盟主开机奖励发放
+                // StatService.Instance.StartPreActPrize(); //押金奖励发放(激活奖励新规)
+                // ActPrizeCheckService.Instance.Start(); //监听无商户号的机具,并再次发奖励
+                // StatService.Instance.ListenFluxRecord(); //同步流量费
+                // LeaderPrizeService.Instance.Start(); //大盟主奖励发奖
+                // OperatePrizeService.Instance.Start(); //运营中心奖励发奖
+                // ActRewardService.Instance.Start(); //发放激活奖励
+                // ActRewardService.Instance.StartAfterAdd(); //补激活奖励
+                // HelpProfitPreMerchantHelper.Instance.Start(); //助利宝每天增加指定数量商机
+                // AddActService.Instance.Start(); //划拨后检查机具激活状态,并自动补录
+                // PrePosRingService.Instance.Start(); //预发未申请提醒
+                // PrePosWithholdService.Instance.Start(); //预发机过期未申请提交到预扣款
+                // PrePosWithholdService.Instance.StartPre(); //预发机申请成功,处理预扣款
+                // PosWithholdService.Instance.Start(); //过期机具激活,清理预扣款
+                // SycnMerchantTradeService.Instance.Start(); //同步商户交易额 
 
-                MessageCenterService.Instance.Start(); // 消息队列
-                LeaderTimeoutSendMessageService.Instance.Start(); //盟主过期消息提醒
+                // MessageCenterService.Instance.Start(); // 消息队列
+                // LeaderTimeoutSendMessageService.Instance.Start(); //盟主过期消息提醒
 
-                AlipayPayBack2Service.Instance.Start(); //支付宝回调处理
-                PosCouponPrizeService.Instance.Start(); //购券奖励队列
-                PosCouponPrizeService.Instance.Start2(); //购券奖励队列(补奖励)
-                OperateAddService.Instance.Start(); //购买运营中心队列
-                BalancePayBackService.Instance.Start(); //余额支付队列
-                ReservePayBackService.Instance.Start(); //储备金支付队列
-                OrderRefundService.Instance.Start(); //商城订单退款
+                // AlipayPayBack2Service.Instance.Start(); //支付宝回调处理
+                // PosCouponPrizeService.Instance.Start(); //购券奖励队列
+                // PosCouponPrizeService.Instance.Start2(); //购券奖励队列(补奖励)
+                // OperateAddService.Instance.Start(); //购买运营中心队列
+                // BalancePayBackService.Instance.Start(); //余额支付队列
+                // ReservePayBackService.Instance.Start(); //储备金支付队列
+                // OrderRefundService.Instance.Start(); //商城订单退款
 
-                StatService.Instance.Start(); //每日重置交易额
-                StoreApplyHelper.Instance.Start(); // 每月1号重置仓库额度
-                DepositReturnStatService.Instance.Start(); //每月1号统计达标商户(退押需要的)
-                DepositReturnStatService.Instance.StartEverTime(); //统计单个商户达标数据(退押需要的)
-                AutoOpOrderService.Instance.StartOrderCancel(); //自动取消超时订单(15分钟)
-                OperateStockService.Instance.Start(); //运营中心库存实时更新
-                ResetSmallStoreHelper.Instance.Start(); //每月重置小分仓额度
-                ResetSmallStoreHelper.Instance.Listen(); //监听每月1号重置小分仓额度
-                ResetSmallStoreHelper.Instance.StartReset(); //监听每月1号重置小分仓额度
-                OperateService.Instance.Start(); //运营中心每天统计一次发货量、库存
-                TimeOutPosChargeService.Instance.StartDoChargeAmount(); //实时监听待扣款记录,并扣费
-                InstallmentDeductionService.Instance.Start(); //分期扣款(每月20号执行)
-                LeaderAmountMonthChangeQueue.Instance.Start(); //每月一号记录上月盟主储蓄金和可提现余额
-                ResetPosFirstFlagAndIsExecuteService.Instance.Start(); //每月1号计算商户首台机具标记
-                OperateAmountRecordService.Instance.Start(); //运营中心额度变更 
-                VirtualApplyHelper.Instance.Start(); //申请虚拟广电卡
+                // StatService.Instance.Start(); //每日重置交易额
+                // StoreApplyHelper.Instance.Start(); // 每月1号重置仓库额度
+                // DepositReturnStatService.Instance.Start(); //每月1号统计达标商户(退押需要的)
+                // DepositReturnStatService.Instance.StartEverTime(); //统计单个商户达标数据(退押需要的)
+                // AutoOpOrderService.Instance.StartOrderCancel(); //自动取消超时订单(15分钟)
+                // OperateStockService.Instance.Start(); //运营中心库存实时更新
+                // ResetSmallStoreHelper.Instance.Start(); //每月重置小分仓额度
+                // ResetSmallStoreHelper.Instance.Listen(); //监听每月1号重置小分仓额度
+                // ResetSmallStoreHelper.Instance.StartReset(); //监听每月1号重置小分仓额度
+                // OperateService.Instance.Start(); //运营中心每天统计一次发货量、库存
+                // TimeOutPosChargeService.Instance.StartDoChargeAmount(); //实时监听待扣款记录,并扣费
+                // InstallmentDeductionService.Instance.Start(); //分期扣款(每月20号执行)
+                // LeaderAmountMonthChangeQueue.Instance.Start(); //每月一号记录上月盟主储蓄金和可提现余额
+                // ResetPosFirstFlagAndIsExecuteService.Instance.Start(); //每月1号计算商户首台机具标记
+                // OperateAmountRecordService.Instance.Start(); //运营中心额度变更 
+                // VirtualApplyHelper.Instance.Start(); //申请虚拟广电卡
 
-                ChangePosTimer.Instance.Start(); //售后换新执行机具数据转移
-                RecommendActStatService.Instance.Start(); //推荐王奖励数据统计
-                StoreApplyHelper.Instance.StartEverTime(); //分仓临时额度变更
-                PreStoreApplyHelper.Instance.StartEverTime(); //小分仓临时额度变更
-                OperateAmountService.Instance.Start(); //运营中心额度变更
-                LeaderApplyCouponsHelper.Instance.Start(); //盟主储蓄金申请机具券打标记
-                DepositReturnService.Instance.Start(); //退押金到支付宝余额
-                StoreApplyHelper.Instance.ResetStoreReserve(); //重置分仓额度
-                AddPosCouponPrizeHelper.Instance.Start(); //补机具券奖励
+                // ChangePosTimer.Instance.Start(); //售后换新执行机具数据转移
+                // RecommendActStatService.Instance.Start(); //推荐王奖励数据统计
+                // StoreApplyHelper.Instance.StartEverTime(); //分仓临时额度变更
+                // PreStoreApplyHelper.Instance.StartEverTime(); //小分仓临时额度变更
+                // OperateAmountService.Instance.Start(); //运营中心额度变更
+                // LeaderApplyCouponsHelper.Instance.Start(); //盟主储蓄金申请机具券打标记
+                // DepositReturnService.Instance.Start(); //退押金到支付宝余额
+                // StoreApplyHelper.Instance.ResetStoreReserve(); //重置分仓额度
+                // AddPosCouponPrizeHelper.Instance.Start(); //补机具券奖励
                 
-                PosChannelHelper.Instance.Start(); //实时查询查询终端收单机构
-                UpUserSaveService.Instance.Start(); //每天凌晨保存头一天的创客关系数据
-                HyfAddPrizeService.Instance.Start(); //盒力四射加码奖励发放
-                PrizeFlowRecordService.Instance.Start(); //奖励返现逻辑日志记录
-                PosCouponExchangeHelper.Instance.Start(); //电签券兑换大机券
-                ToBigHelper.Instance.Start(); //机具通对资格
-                TradeFilterService.Instance.Start(); //营训奖励拦截
+                // PosChannelHelper.Instance.Start(); //实时查询查询终端收单机构
+                // UpUserSaveService.Instance.Start(); //每天凌晨保存头一天的创客关系数据
+                // HyfAddPrizeService.Instance.Start(); //盒力四射加码奖励发放
+                // PrizeFlowRecordService.Instance.Start(); //奖励返现逻辑日志记录
+                // PosCouponExchangeHelper.Instance.Start(); //电签券兑换大机券
+                // ToBigHelper.Instance.Start(); //机具通对资格
+                // TradeFilterService.Instance.Start(); //营训奖励拦截
 
 
                 // PosCouponPrizeTest.Instance.Start();
             // }
 
+            SycnSpTradeWifiServiceTmp.Instance.Start();
+
 
 
 

+ 1 - 1
appsettings.Development.json

@@ -19,7 +19,7 @@
     "Database": "KxsMainServer",
     "SqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
     "Pxc1SqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
-    "ReadSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsMainServer;charset=utf8;",
+    "ReadSqlConnStr": "server=rr-2vc53lrwpwm1ewscogo.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;DefaultCommandTimeout=600;",
     "MainSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsStatServer;charset=utf8;",
     "SpSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsSpServer;charset=utf8;",
     "OpSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;port=3306;database=KxsOpServer;charset=utf8;",

Some files were not shown because too many files changed in this diff