wifi解绑逻辑完成，待测试

AppStart/Helper/SycnSpServer/SycnSpTradeWifiService.cs

@@ -43,11 +43,12 @@ namespace MySystem
                             decimal TradeAmount = trade.TradeAmount;
                             if(trade.SeoTitle != "v2") TradeAmount = TradeAmount / 100;
                             bool statFlag = false;
+                            PxcModels.WifiTradeRecord add = new PxcModels.WifiTradeRecord();
                             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()
+                                add = db.WifiTradeRecord.Add(new PxcModels.WifiTradeRecord()
                                 {
                                     CreateDate = trade.CreateDate,
                                     UpdateDate = trade.UpdateDate,
@@ -84,13 +85,13 @@ namespace MySystem
                                     pos.ActivationState = 1;
                                     pos.ActivationTime = DateTime.Now;
 
-                                    PxcModels.PosMerchantInfo add = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PxcModels.PosMerchantInfo();
-                                    add.ActiveStatus = 1;
-                                    add.MerStandardDate = DateTime.Now;
+                                    PxcModels.PosMerchantInfo mer = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PxcModels.PosMerchantInfo();
+                                    mer.ActiveStatus = 1;
+                                    mer.MerStandardDate = DateTime.Now;
                                     db.SaveChanges();
 
                                     //检查交易状态，并发奖励
-                                    SycnSpMerchantService.Instance.WifiSendPrize(db, pos, add);
+                                    SycnSpMerchantService.Instance.WifiSendPrize(db, pos, mer);
 
                                     //发放奖励MQ
                                     PrizeSetHelper.Do("6", pos.PosSn);
@@ -119,6 +120,10 @@ namespace MySystem
                                 if(pos.BrandId == 26 && TradeAmount == 2698) Months = 24;
                             }
 
+                            add.Duration = Months;
+                            add.Unit = "m";
+                            db.SaveChanges();
+
                             if(Months > 0)
                             {
                                 decimal TradeAmt = TradeAmount / Months;
@@ -151,8 +156,8 @@ namespace MySystem
                             //检查交易状态，并发奖励
                             if(pos.ActivationState == 1)
                             {
-                                PxcModels.PosMerchantInfo add = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PxcModels.PosMerchantInfo();
-                                SycnSpMerchantService.Instance.WifiSendPrize(db, pos, add);
+                                PxcModels.PosMerchantInfo mer = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PxcModels.PosMerchantInfo();
+                                SycnSpMerchantService.Instance.WifiSendPrize(db, pos, mer);
                             }
 
                             TradeRecord edit = spdb.TradeRecord.FirstOrDefault(m => m.Id == trade.Id);

AppStart/WifiUnBindHelper.cs

@@ -68,11 +68,28 @@ public class WifiUnBindHelper
             db.SaveChanges();
         }
 
-        string TradeDate = DateTime.Now.ToString("yyyyMMdd");
         WifiTradeRecord trade = db.WifiTradeRecord.FirstOrDefault(m => m.SnNo == SnNo);
         if(trade != null)
         {
-            
+            if(trade.Unit == "m" && trade.Duration > 0)
+            {
+                decimal TradeAmt = trade.TradeAmount / trade.Duration;
+                string TradeMonth = trade.CreateDate.Value.ToString("yyyy-MM");
+                DateTime StartMonth = DateTime.Parse(TradeMonth + "-01 00:00:00");
+                for (int i = 1; i <= trade.Duration; i++)
+                {
+                    StartMonth = StartMonth.AddMonths(1);
+                    SycnSpTradeWifiService.Instance.StatTrade(db, pos.BuyUserId, pos.BrandId, StartMonth.ToString("yyyyMM"), -TradeAmt);
+                    if (pos.BindingTime < trade.CreateDate.Value.AddMonths(-9))
+                    {
+                        SycnSpTradeWifiService.Instance.StatTradeBefore(db, pos.BuyUserId, pos.BrandId, StartMonth.ToString("yyyyMM"), -TradeAmt);
+                    }
+                    else
+                    {
+                        SycnSpTradeWifiService.Instance.StatTradeAfter(db, pos.BuyUserId, pos.BrandId, StartMonth.ToString("yyyyMM"), -TradeAmt);
+                    }
+                }
+            }
             db.SaveChanges();
         }
     }

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/WebCMSEntities.cs

@@ -5109,6 +5109,9 @@ namespace MySystem.PxcModels
             {
                 entity.HasComment("领导人达标奖交易额统计");
 
+                entity.HasIndex(e => e.ParentUserId)
+                    .HasName("LeaderCompTradeStatIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.CheckSelfTradeAmount)
@@ -14073,6 +14076,10 @@ namespace MySystem.PxcModels
 
                 entity.Property(e => e.DirectUserId).HasColumnType("int(11)");
 
+                entity.Property(e => e.Kind)
+                    .HasColumnType("int(11)")
+                    .HasComment("分类");
+
                 entity.Property(e => e.QueryCount).HasColumnType("int(11)");
 
                 entity.Property(e => e.SeoDescription)
@@ -15587,6 +15594,10 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.ApplyNum)
+                    .HasColumnType("int(11)")
+                    .HasComment("出库数");
+
                 entity.Property(e => e.Areas)
                     .HasColumnType("varchar(30)")
                     .HasCharSet("utf8")
@@ -22198,6 +22209,10 @@ namespace MySystem.PxcModels
                     .HasColumnType("datetime")
                     .HasComment("创建时间");
 
+                entity.Property(e => e.Duration)
+                    .HasColumnType("int(11)")
+                    .HasComment("时长");
+
                 entity.Property(e => e.Remark)
                     .HasColumnType("varchar(64)")
                     .HasComment("备注")
@@ -22218,6 +22233,12 @@ namespace MySystem.PxcModels
                     .HasColumnType("decimal(18,2)")
                     .HasComment("交易金额");
 
+                entity.Property(e => e.Unit)
+                    .HasColumnType("varchar(5)")
+                    .HasComment("单位")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.UpdateDate)
                     .HasColumnType("datetime")
                     .HasComment("修改时间");

PxcModels/WifiTradeRecord.cs

@@ -13,5 +13,7 @@ namespace MySystem.PxcModels
         public int BrandId { get; set; }
         public decimal TradeAmount { get; set; }
         public string SnNo { get; set; }
+        public int Duration { get; set; }
+        public string Unit { get; set; }
     }
 }