wifi第二单不统计交易

AppStart/Helper/SycnSpServer/SycnSpTradeWifiService.cs

@@ -47,6 +47,7 @@ namespace MySystem
                                 CreateDate = trade.CreateDate,
                                 UpdateDate = trade.UpdateDate,
                                 SnNo = trade.TradeSnNo, //渠道SN号
+                                MerNo = trade.MerNo, //商户号
                                 TradeAmount = TradeAmount, //交易金额
                                 BrandId = BrandId, //品牌
                                 Remark = trade.MerNo, //备注

AppStart/WifiTradeHelper.cs

@@ -165,7 +165,7 @@ public class WifiTradeHelper
         WifiTradeRecord edit = db.WifiTradeRecord.FirstOrDefault(m => m.Id == Id);
         if(edit != null)
         { 
-            int orderCount = db.WifiTradeRecord.Count(m => m.SnNo == edit.SnNo);
+            int orderCount = db.WifiTradeRecord.Count(m => m.SnNo == edit.SnNo && m.MerNo == edit.MerNo);
             if(edit.LastMonth != Month.Replace("-", ""))
             {
                 decimal TradeAmt = edit.TradeAmount / edit.Duration;

PxcModels/LeaderCompTmp.cs

@@ -9,5 +9,6 @@ namespace MySystem.PxcModels
         public string EveryMonthData { get; set; }
         public string ParentNav { get; set; }
         public int ParentUserId { get; set; }
+        public int LeaderType { get; set; }
     }
 }

PxcModels/LeaderCompTradeStat.cs

@@ -27,5 +27,6 @@ namespace MySystem.PxcModels
         public decimal SelfResultTradeAmount { get; set; }
         public decimal SelfTradeAmount { get; set; }
         public decimal CheckSelfTradeAmount { get; set; }
+        public int LeaderType { get; set; }
     }
 }

PxcModels/WebCMSEntities.cs

@@ -5355,6 +5355,10 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.LeaderType)
+                    .HasColumnType("int(11)")
+                    .HasComment("盟主等级");
+
                 entity.Property(e => e.ParentNav)
                     .HasColumnType("varchar(1000)")
                     .HasComment("上级创客集合")
@@ -5418,6 +5422,10 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.LeaderType)
+                    .HasColumnType("int(11)")
+                    .HasComment("盟主等级");
+
                 entity.Property(e => e.ParentNav)
                     .HasColumnType("varchar(1000)")
                     .HasComment("上级创客集合")
@@ -22796,6 +22804,12 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.MerNo)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.Remark)
                     .HasColumnType("varchar(64)")
                     .HasComment("备注")

PxcModels/WifiTradeRecord.cs

@@ -17,5 +17,6 @@ namespace MySystem.PxcModels
         public string Unit { get; set; }
         public int DoMonths { get; set; }
         public string LastMonth { get; set; }
+        public string MerNo { get; set; }
     }
 }