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

AppStart/Helper/StatService2.cs

@@ -63,7 +63,7 @@ namespace MySystem
                         }
                         List<KxsMainModels.Users> users = maindb.Users.Where(m => idlist.Contains(m.Id)).ToList();
                         function.WriteLog("ids:" + ids, "统计商户和创客交易额日志2");
-                        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')", AppConfig.Base.SqlConn2);
+                        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", AppConfig.Base.SqlConn2);
                         function.WriteLog("统计人数:" + selfDt.Rows.Count, "统计商户和创客交易额日志2");
                         function.WriteLog("2--" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), "统计商户和创客交易额日志2");
                         if (selfDt.Rows.Count > 0)
@@ -84,12 +84,13 @@ 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());
 
                                 function.WriteLog("21--" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), "统计商户和创客交易额日志2");
 
                                 function.WriteLog("创客交易额", "统计商户和创客交易额日志2");
                                 //创客交易额
-                                UserAmountSummary selfStat = db.UserAmountSummary.FirstOrDefault(m => m.Id > 1190107 && m.UserId == UserId && m.IsAct == IsAct && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.PayMode == PayMode && m.SeoTitle == "self");
+                                UserAmountSummary selfStat = db.UserAmountSummary.FirstOrDefault(m => m.Id > 1190107 && 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.UserAmountSummary.Add(new UserAmountSummary()
@@ -100,6 +101,7 @@ namespace MySystem
                                         PayMode = PayMode,
                                         IsAct = IsAct,
                                         SeoTitle = "self",
+                                        Sort = Sort,
                                     }).Entity;
                                     db.SaveChanges();
                                 }
@@ -112,7 +114,7 @@ namespace MySystem
                                     foreach (string NavUserIdString in ParentNavList)
                                     {
                                         int NavUserId = int.Parse(NavUserIdString);
-                                        UserAmountSummary teamStat = db.UserAmountSummary.FirstOrDefault(m => m.Id > 1190107 && m.UserId == NavUserId && m.IsAct == IsAct && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.PayMode == PayMode && m.SeoTitle == "team");
+                                        UserAmountSummary teamStat = db.UserAmountSummary.FirstOrDefault(m => m.Id > 1190107 && 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.UserAmountSummary.Add(new UserAmountSummary()
@@ -123,6 +125,7 @@ namespace MySystem
                                                 PayMode = PayMode,
                                                 IsAct = IsAct,
                                                 SeoTitle = "team",
+                                                Sort = Sort,
                                             }).Entity;
                                             db.SaveChanges();
                                         }