统计创客交易额，区分费率

AppStart/Helper/StatGdService2.cs

@@ -57,7 +57,7 @@ namespace MySystem
                         {
                             ids += idsDr["Id"].ToString() + ",";
                         }
-                        DataTable selfDt = CustomerSqlConn.dtable("select UserId,MerchantId,SnNo,PayMode,IsAct,DATE_FORMAT(CreateDate,'%Y%m%d'),sum(PayMoney),count(Id),sum(MaxDivi),sum(MerchantActualAmount) from ConsumerOrders where Id in (" + ids.TrimEnd(',') + ") group by UserId,MerchantId,SnNo,PayMode,IsAct,DATE_FORMAT(CreateDate,'%Y%m%d')", connstr);
+                        DataTable selfDt = CustomerSqlConn.dtable("select UserId,MerchantId,SnNo,PayMode,IsAct,DATE_FORMAT(CreateDate,'%Y%m%d'),sum(PayMoney),count(Id),sum(MaxDivi),sum(MerchantActualAmount),Sort from ConsumerOrders where Id in (" + ids.TrimEnd(',') + ") group by UserId,MerchantId,SnNo,PayMode,IsAct,DATE_FORMAT(CreateDate,'%Y%m%d'),Sort", connstr);
                         if (selfDt.Rows.Count > 0)
                         {
                             function.WriteLog("统计人数:" + selfDt.Rows.Count + "\n\n", "统计创客归档交易日志2");
@@ -110,9 +110,10 @@ namespace MySystem
             decimal MaxDivi = decimal.Parse(selfDr[8].ToString());
             decimal ActualAmount = decimal.Parse(selfDr[9].ToString());
             string TradeMonth = TradeDate.Substring(0, 6);
+            int Sort = int.Parse(selfDr["Sort"].ToString());
 
             //创客交易额
-            UserAmountSummaryBefore selfStat = db.UserAmountSummaryBefore.FirstOrDefault(m => m.UserId == UserId && m.IsAct == IsAct && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.PayMode == PayMode && m.SeoTitle == "self");
+            UserAmountSummaryBefore selfStat = db.UserAmountSummaryBefore.FirstOrDefault(m => m.UserId == UserId && m.IsAct == IsAct && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.PayMode == PayMode && m.SeoTitle == "self" && m.Sort == Sort);
             if (selfStat == null)
             {
                 selfStat = db.UserAmountSummaryBefore.Add(new UserAmountSummaryBefore()
@@ -123,6 +124,7 @@ namespace MySystem
                     PayMode = PayMode,
                     IsAct = IsAct,
                     SeoTitle = "self",
+                    Sort = Sort,
                 }).Entity;
                 db.SaveChanges();
             }
@@ -135,7 +137,7 @@ namespace MySystem
                 foreach (string NavUserIdString in ParentNavList)
                 {
                     int NavUserId = int.Parse(NavUserIdString);
-                    UserAmountSummaryBefore teamStat = db.UserAmountSummaryBefore.FirstOrDefault(m => m.UserId == NavUserId && m.IsAct == IsAct && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.PayMode == PayMode && m.SeoTitle == "team");
+                    UserAmountSummaryBefore teamStat = db.UserAmountSummaryBefore.FirstOrDefault(m => m.UserId == NavUserId && m.IsAct == IsAct && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.PayMode == PayMode && m.SeoTitle == "team" && m.Sort == Sort);
                     if (teamStat == null)
                     {
                         teamStat = db.UserAmountSummaryBefore.Add(new UserAmountSummaryBefore()
@@ -146,6 +148,7 @@ namespace MySystem
                             PayMode = PayMode,
                             IsAct = IsAct,
                             SeoTitle = "team",
+                            Sort = Sort,
                         }).Entity;
                         db.SaveChanges();
                     }
@@ -168,9 +171,10 @@ namespace MySystem
             decimal MaxDivi = decimal.Parse(selfDr[8].ToString());
             decimal ActualAmount = decimal.Parse(selfDr[9].ToString());
             string TradeMonth = TradeDate.Substring(0, 6);
+            int Sort = int.Parse(selfDr["Sort"].ToString());
 
             //创客交易额
-            UserAmountSummaryAfter selfStat = db.UserAmountSummaryAfter.FirstOrDefault(m => m.UserId == UserId && m.IsAct == IsAct && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.PayMode == PayMode && m.SeoTitle == "self");
+            UserAmountSummaryAfter selfStat = db.UserAmountSummaryAfter.FirstOrDefault(m => m.UserId == UserId && m.IsAct == IsAct && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.PayMode == PayMode && m.SeoTitle == "self" && m.Sort == Sort);
             if (selfStat == null)
             {
                 selfStat = db.UserAmountSummaryAfter.Add(new UserAmountSummaryAfter()
@@ -181,6 +185,7 @@ namespace MySystem
                     PayMode = PayMode,
                     IsAct = IsAct,
                     SeoTitle = "self",
+                    Sort = Sort,
                 }).Entity;
                 db.SaveChanges();
             }
@@ -193,7 +198,7 @@ namespace MySystem
                 foreach (string NavUserIdString in ParentNavList)
                 {
                     int NavUserId = int.Parse(NavUserIdString);
-                    UserAmountSummaryAfter teamStat = db.UserAmountSummaryAfter.FirstOrDefault(m => m.UserId == NavUserId && m.IsAct == IsAct && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.PayMode == PayMode && m.SeoTitle == "team");
+                    UserAmountSummaryAfter teamStat = db.UserAmountSummaryAfter.FirstOrDefault(m => m.UserId == NavUserId && m.IsAct == IsAct && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.PayMode == PayMode && m.SeoTitle == "team" && m.Sort == Sort);
                     if (teamStat == null)
                     {
                         teamStat = db.UserAmountSummaryAfter.Add(new UserAmountSummaryAfter()
@@ -204,6 +209,7 @@ namespace MySystem
                             PayMode = PayMode,
                             IsAct = IsAct,
                             SeoTitle = "team",
+                            Sort = Sort,
                         }).Entity;
                         db.SaveChanges();
                     }