Merge branch 'feat-lcl-wifi设备' into release-mainserver

AppStart/Helper/LeaderPrizeService.cs

@@ -43,6 +43,10 @@ namespace MySystem
                                 {
                                     ChangeAmount = 19 * 0.15M;
                                 }
+                                if(pos.BrandId == 23 || pos.BrandId == 24 || pos.BrandId == 25 || pos.BrandId == 26)
+                                {
+                                    ChangeAmount = 4.5M;
+                                }
                                 int LeaderUserId = pos.LeaderUserId;
                                 UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == LeaderUserId);
                                 if (account == null)

AppStart/Helper/StatService.cs

@@ -351,6 +351,10 @@ namespace MySystem
             BrandIds.Add(19);
             BrandIds.Add(20);
             BrandIds.Add(21);
+            BrandIds.Add(23);
+            BrandIds.Add(24);
+            BrandIds.Add(25);
+            BrandIds.Add(26);
             WebCMSEntities db = new WebCMSEntities();
             DateTime yesterday = DateTime.Now.AddDays(-1);
             DateTime today = DateTime.Now.AddMinutes(-10);
@@ -456,7 +460,17 @@ namespace MySystem
             WebCMSEntities db = new WebCMSEntities();
             DateTime yesterday = DateTime.Now.AddDays(-31);
             DateTime today = DateTime.Now.AddMinutes(-10);
-            IQueryable<PosMachinesTwo> posList = db.PosMachinesTwo.Where(m => m.ActivationState == 1 && (string.IsNullOrEmpty(m.SeoKeyword) || m.SeoKeyword == "0") && m.CreditTrade >= 5000 && m.BrandId != 12 && m.BrandId != 13 && m.BrandId != 14 && m.BrandId != 15 && m.BrandId != 16 && m.Detail != "1");
+            List<int> BrandIds = new List<int>();
+            BrandIds.Add(12);
+            BrandIds.Add(13);
+            BrandIds.Add(14);
+            BrandIds.Add(15);
+            BrandIds.Add(16);
+            BrandIds.Add(23);
+            BrandIds.Add(24);
+            BrandIds.Add(25);
+            BrandIds.Add(26);
+            IQueryable<PosMachinesTwo> posList = db.PosMachinesTwo.Where(m => m.ActivationState == 1 && (string.IsNullOrEmpty(m.SeoKeyword) || m.SeoKeyword == "0") && m.CreditTrade >= 5000 && !BrandIds.Contains(m.BrandId) && m.Detail != "1");
             if (posid > 0)
             {
                 posList = posList.Where(m => m.Id == posid);
@@ -773,7 +787,7 @@ namespace MySystem
         {
             string MerNo = merchant.KqMerNo;
             //判断商户号是否为空，避免下次再有空商户的情况，导致奖励不发放
-            if(string.IsNullOrEmpty(MerNo))
+            if(string.IsNullOrEmpty(MerNo) && (pos.BrandId < 23 || pos.BrandId > 26))
             {
                 // MerNo = "n" + DateTime.Now.ToString("yyyyMMddHHmmssfff");
                 RedisDbconn.Instance.AddList("ActiveRewardFailQueue", "{\"PosId\":\"" + pos.Id + "\",\"UserId\":\"" + GetUserId + "\",\"ActPrize\":\"" + ActPrize + "\",\"ChangeType\":\"" + ChangeType + "\",\"ActType\":\"" + ActType + "\"}");
@@ -784,6 +798,10 @@ namespace MySystem
             BrandIds.Add(19);
             BrandIds.Add(20);
             BrandIds.Add(21);
+            BrandIds.Add(23);
+            BrandIds.Add(24);
+            BrandIds.Add(25);
+            BrandIds.Add(26);
             bool check = false;
             if(!BrandIds.Contains(pos.BrandId))
             {
@@ -1192,6 +1210,10 @@ namespace MySystem
                         BrandIds.Add(19);
                         BrandIds.Add(20);
                         BrandIds.Add(21);
+                        BrandIds.Add(23);
+                        BrandIds.Add(24);
+                        BrandIds.Add(25);
+                        BrandIds.Add(26);
                         WebCMSEntities db = new WebCMSEntities();
                         OpModels.WebCMSEntities opdb = new OpModels.WebCMSEntities();
                         PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == PosId && m.ActivationState == 1 && ((!string.IsNullOrEmpty(m.SeoKeyword) && m.SeoKeyword != "0" && m.CreditTrade >= 1000) || BrandIds.Contains(m.BrandId)));
@@ -1225,6 +1247,10 @@ namespace MySystem
                                                 {
                                                     Prize = 20;
                                                 }
+                                                if(pos.BrandId == 23 || pos.BrandId == 24 || pos.BrandId == 25 || pos.BrandId == 26)
+                                                {
+                                                    Prize = 3;
+                                                }
                                                 string[] ParentNavs = ParentNav.Trim(',').Replace(",,", ",").Split(',');
                                                 for (int i = ParentNavs.Length - 1; i >= 0; i--)
                                                 {
@@ -2111,12 +2137,55 @@ namespace MySystem
                 string start = date + " 00:00:00";
                 string end = DateTime.Parse(date).AddDays(1).ToString("yyyy-MM-dd") + " 00:00:00";
                 CustomerSqlConn.op("insert into PosMerchantTradeSummay (MerchantId,BrandId,TradeDate,TradeMonth,TradeAmount,CreateDate)  select *,now() from (select MerchantId,BrandId,DATE_FORMAT(CreateDate,'%Y%m%d') as TradeDate,DATE_FORMAT(CreateDate,'%Y%m') as TradeMonth,sum(TradeAmount) as TradeAmount from TradeRecord where Id>=13000000 and CreateDate>='" + start + "' and CreateDate<'" + end + "' and ActStatus=1 and BrandId!=14 group by MerchantId,BrandId,DATE_FORMAT(CreateDate,'%Y%m%d'),TradeDate,DATE_FORMAT(CreateDate,'%Y%m') order by MerchantId,BrandId,DATE_FORMAT(CreateDate,'%Y%m%d')) tb", MysqlConn.SqlConnStr);
-
             }
             catch (Exception ex)
             {
                 function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "统计商户的交易额");
             }
+
+            WebCMSEntities db = new WebCMSEntities();
+            var tran = db.Database.BeginTransaction();
+            try
+            {
+                SpModels.WebCMSEntities spdb = new SpModels.WebCMSEntities();
+                DateTime s = DateTime.Parse(date + " 00:00:00");
+                DateTime e = s.AddDays(1);
+                int StartId = int.Parse(function.CheckInt(function.ReadInstance("/SycnSp/TradeRecordId.txt")));
+                IQueryable<SpModels.TradeRecord> trades = spdb.TradeRecord.Where(m => m.Id >= StartId && m.ProductType == "23" && m.CreateDate >= s && m.CreateDate < e).OrderBy(m => m.CreateDate);
+                foreach (SpModels.TradeRecord trade in trades.ToList())
+                {
+                    string MerNo = trade.MerNo;
+                    string TradeDate = trade.CreateDate.Value.ToString("yyyyMMdd");
+                    string TradeMonth = TradeDate.Substring(0, 6);
+                    PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == MerNo);
+                    if(merchant != null)
+                    {
+                        PosMerchantTradeSummay stat = db.PosMerchantTradeSummay.FirstOrDefault(m => m.MerchantId == merchant.Id && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == merchant.BrandId);
+                        if (stat == null)
+                        {
+                            stat = db.PosMerchantTradeSummay.Add(new PosMerchantTradeSummay()
+                            {
+                                MerchantId = merchant.Id,
+                                TradeMonth = TradeMonth,
+                                TradeDate = TradeDate,
+                                BrandId = merchant.BrandId,
+                            }).Entity;
+                            db.SaveChanges();
+                        }
+                        stat.TradeAmount += trade.TradeAmount / 100;
+                        db.SaveChanges();
+                    }
+                }
+                spdb.Dispose();
+                tran.Commit();
+            }
+            catch (Exception ex)
+            {
+                tran.Rollback();
+                function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "统计WIFI商户的交易额");
+            }
+            tran.Dispose();
+            db.Dispose();
             function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行商户交易额日志");
         }
 

AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -58,8 +58,8 @@ namespace MySystem
                                 }
 
                                 PxcModels.PosMerchantInfo add = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mer.MerNo);
-                                //如果是好哒品牌需要和SN一起判断
-                                if(pos.BrandId == 18 || pos.BrandId == 19 || pos.BrandId == 20 || pos.BrandId == 21)
+                                //如果是好哒和WIFI品牌需要和SN一起判断
+                                if(pos.BrandId >= 18 && pos.BrandId <= 26 && pos.BrandId != 22)
                                 {
                                     add = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mer.MerNo && m.KqSnNo == Mer.SnNo);
                                 }
@@ -183,12 +183,59 @@ namespace MySystem
                                     }
                                 }
 
-                                // if(pos.PrizeParams == "0")
-                                // {
-                                //     int RecordId = PublicFunction.FeeSetRecord(db, pos, add, 0.63M);
-                                //     string info = "{\"RecordId\":\"" + RecordId + "\",\"PosId\":\"" + pos.Id + "\",\"Fee\": \"0.63\",\"Kind\": \"2\",\"OpMan\": \""+"系统"+"\"}";
-                                //     RedisDbconn.Instance.AddList("SetDepositQueue", info);
-                                // }
+                                //WIFI设备默认设置押金
+                                if(pos.BrandId >= 23 && pos.BrandId <= 26)
+                                {
+                                    decimal Prize = 0;
+                                    if(pos.BrandId == 23)
+                                    {
+                                        pos.SeoKeyword = "30";
+                                        pos.PrizeParams = "30";
+                                    }
+                                    if(pos.BrandId == 24)
+                                    {
+                                        pos.SeoKeyword = "120";
+                                        pos.PrizeParams = "120";
+                                    }
+                                    if(pos.BrandId == 25)
+                                    {
+                                        pos.SeoKeyword = "200";
+                                        pos.PrizeParams = "200";
+                                    }
+                                    if(pos.BrandId == 26)
+                                    {
+                                        pos.SeoKeyword = "750";
+                                        pos.PrizeParams = "750";
+                                    }
+
+                                    pos.ActivationState = 1;
+                                    pos.ActivationTime = DateTime.Now;
+                                    add.ActiveStatus = 1;
+                                    add.MerStandardDate = DateTime.Now;
+                                    db.SaveChanges();
+
+                                    //检查交易状态，并发奖励
+                                    PxcModels.WifiTradeRecord trade = db.WifiTradeRecord.FirstOrDefault(m => m.SnNo == pos.PosSn && m.Status == 0);
+                                    if (trade != null)
+                                    {
+                                        trade.Status = 1;
+                                        db.SaveChanges();
+                                        Prize = trade.TradeAmount * 0.15M;
+                                        StatService.Instance.doActiveReward(db, add, pos, pos.BuyUserId, user.ParentNav, TopUserId, Prize);
+                                        if (pos.CardType < 100)
+                                        {
+                                            RedisDbconn.Instance.AddList("OpenRewardQueue", pos.Id.ToString());
+                                        }
+                                        if (pos.LeaderUserId > 0 && db.Leaders.Any(m => m.Id == pos.LeaderUserId && m.ExpiredDate > DateTime.Now) && pos.CardType < 100)
+                                        {
+                                            RedisDbconn.Instance.AddList("LeaderPrizeQueue", pos.Id);
+                                        }
+                                        if (pos.CardType < 100)
+                                        {
+                                            RedisDbconn.Instance.AddList("OperatePrizeQueue", pos.Id);
+                                        }
+                                    }
+                                }
 
                                 Merchants edit = spdb.Merchants.FirstOrDefault(m => m.Id == Mer.Id);
                                 if (edit != null)

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -30,6 +30,10 @@ namespace MySystem
                     List<string> BrandIds = new List<string>();
                     BrandIds.Add("14");
                     BrandIds.Add("17");
+                    BrandIds.Add("23");
+                    BrandIds.Add("24");
+                    BrandIds.Add("25");
+                    BrandIds.Add("26");
                     WebCMSEntities spdb = new WebCMSEntities();
                     PxcModels.WebCMSEntities db = new PxcModels.WebCMSEntities();
                     DateTime start = DateTime.Now.AddDays(-10);
@@ -508,6 +512,11 @@ namespace MySystem
                                             {
                                                 Version = 1;
                                             }
+                                            if(pos.BrandId >= 23 && pos.BrandId <= 26)
+                                            {
+                                                MerHelpFlag = 1;
+                                                Version = 0;
+                                            }
                                             decimal SettleFee = trade.SettleFee * 100;
                                             PxcModels.TradeRecord add = db.TradeRecord.Add(new PxcModels.TradeRecord()
                                             {

AppStart/Helper/SycnSpServer/SycnSpTradeWifiService.cs

@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MySystem.SpModels;
+using Library;
+using LitJson;
+using System.Threading;
+
+namespace MySystem
+{
+    public class SycnSpTradeWifiService
+    {
+        public readonly static SycnSpTradeWifiService Instance = new SycnSpTradeWifiService();
+        private SycnSpTradeWifiService()
+        { }
+
+        public void Start()
+        {
+            Thread th = new Thread(StartDo);
+            th.IsBackground = true;
+            th.Start();
+        }
+
+        public void StartDo()
+        {
+            while (true)
+            {
+                try
+                {
+                    WebCMSEntities spdb = new WebCMSEntities();
+                    PxcModels.WebCMSEntities db = new PxcModels.WebCMSEntities();
+                    DateTime start = DateTime.Now.AddDays(-10);
+                    DateTime end = DateTime.Now.AddMinutes(-1);
+                    int StartId = int.Parse(function.CheckInt(function.ReadInstance("/SycnSp/TradeRecordId.txt")));
+                    IQueryable<TradeRecord> trades = spdb.TradeRecord.Where(m => m.Id >= StartId && m.ProductType == "23" && m.CreateDate >= start && m.Status == 1).OrderBy(m => m.CreateDate).Take(20);
+                    foreach (TradeRecord trade in trades.ToList())
+                    {
+                        bool check = db.SpOrderNos.Any(m => m.OrderNo == trade.TradeSerialNo);
+                        if (!check)
+                        {
+                            decimal TradeAmount = trade.TradeAmount / 100;
+                            PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == trade.TradeSnNo);
+                            if (pos != null)
+                            {
+                                PxcModels.WifiTradeRecord add = db.WifiTradeRecord.Add(new PxcModels.WifiTradeRecord()
+                                {
+                                    CreateDate = trade.CreateDate,
+                                    UpdateDate = trade.UpdateDate,
+                                    SnNo = trade.TradeSnNo, //渠道SN号
+                                    TradeAmount = TradeAmount, //交易金额
+                                    BrandId = pos.BrandId, //品牌
+                                    Remark = trade.Remark, //备注                                
+                                }).Entity;
+                            }
+                            db.SpOrderNos.Add(new PxcModels.SpOrderNos()
+                            {
+                                OrderNo = trade.TradeSerialNo
+                            });
+                            db.SaveChanges();
+
+                            //开始统计
+                            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;
+                                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;
+                                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(db, pos.BuyUserId, pos.BrandId, StartMonth.ToString("yyyyMM"), TradeAmt);
+                                }
+                            }
+
+                            TradeRecord edit = spdb.TradeRecord.FirstOrDefault(m => m.Id == trade.Id);
+                            if (edit != null)
+                            {
+                                edit.Status = 2;
+                                spdb.SaveChanges();
+                            }
+                            
+                        }
+                    }           
+                    spdb.Dispose();
+                    db.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "同步SP交易数据到MAIN异常");
+                }
+                Thread.Sleep(500);
+            }
+        }
+
+        public void StatTrade(PxcModels.WebCMSEntities db, int UserId, int BrandId, string TradeMonth, decimal TradeAmount)
+        {
+            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();
+                }
+            }
+        }
+    }
+}

PxcModels/WebCMSEntities.cs

@@ -314,6 +314,7 @@ namespace MySystem.PxcModels
         public virtual DbSet<UserYearEndInCome> UserYearEndInCome { get; set; }
         public virtual DbSet<UserYearEndSummary> UserYearEndSummary { get; set; }
         public virtual DbSet<Users> Users { get; set; }
+        public virtual DbSet<WifiTradeRecord> WifiTradeRecord { get; set; }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
@@ -22182,6 +22183,45 @@ namespace MySystem.PxcModels
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<WifiTradeRecord>(entity =>
+            {
+                entity.HasComment("WIFI交易记录");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.BrandId)
+                    .HasColumnType("int(11)")
+                    .HasComment("品牌");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("varchar(64)")
+                    .HasComment("备注")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SnNo)
+                    .HasColumnType("varchar(32)")
+                    .HasComment("渠道SN号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.TradeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("交易金额");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+            });
+
             OnModelCreatingPartial(modelBuilder);
         }
 

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

Startup.cs

@@ -174,6 +174,7 @@ namespace MySystem
                 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(); //恢复原始交易没有统计上的数据