交易记录入库添加借记卡封顶标记字段

AppStart/Helper/StatService.cs

@@ -1181,7 +1181,7 @@ namespace MySystem
         }
         public void StartEverDayDo()
         {
-            DateTime end = DateTime.Parse("2022-06-01 00:00:00");
+            DateTime end = DateTime.Parse("2022-06-06 00:00:00");
             DateTime check = DateTime.Parse("2022-03-11");
             while (check <= end)
             {
@@ -1216,7 +1216,7 @@ namespace MySystem
                     int UserId = int.Parse(userDr["Id"].ToString());
                     string ParentNav = userDr["ParentNav"].ToString();
                     function.WriteLog(UserId + ":" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行昨天交易额日志");
-                    DataTable selfdt = OtherMySqlConn.dtable("select BrandId,BankCardType,QrPayFlag,MerHelpFlag,sum(TradeAmount) from TradeRecord where Id>=" + startId + " and CreateDate>='" + start + "' and CreateDate<'" + end + "' and UserId=" + UserId + " group by BrandId,BankCardType,QrPayFlag,MerHelpFlag");
+                    DataTable selfdt = OtherMySqlConn.dtable("select BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag,sum(TradeAmount),count(Id) from TradeRecord where Id>=" + startId + " and CreateDate>='" + start + "' and CreateDate<'" + end + "' and UserId=" + UserId + " group by BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag");
                     function.WriteLog(UserId + ":" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行昨天交易额日志");
                     foreach (DataRow selfDr in selfdt.Rows)
                     {
@@ -1224,7 +1224,9 @@ namespace MySystem
                         int BankCardType = int.Parse(selfDr["BankCardType"].ToString());
                         int QrPayFlag = int.Parse(selfDr["QrPayFlag"].ToString());
                         int MerHelpFlag = int.Parse(selfDr["MerHelpFlag"].ToString());
-                        decimal TradeAmount = decimal.Parse(selfDr[4].ToString());
+                        int CapFlag = int.Parse(selfDr["CapFlag"].ToString());
+                        decimal TradeAmount = decimal.Parse(selfDr[5].ToString());
+                        int TradeCount = int.Parse(selfDr[6].ToString());
                         TradeDaySummary selfStat = db.TradeDaySummary.FirstOrDefault(m => m.UserId == UserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.QueryCount == QrPayFlag && m.SeoTitle == "self");
                         if (selfStat == null)
                         {
@@ -1244,10 +1246,20 @@ namespace MySystem
                             if(MerHelpFlag == 1)
                             {
                                 selfStat.HelpDirectDebitTradeAmt += TradeAmount;
+                                if(CapFlag == 1)
+                                {
+                                    selfStat.HelpDirectDebitCapTradeAmt += TradeAmount;
+                                    selfStat.HelpDirectDebitCapNum += TradeCount;
+                                }
                             }
                             else
                             {
                                 selfStat.NotHelpDirectDebitTradeAmt += TradeAmount;
+                                if(CapFlag == 1)
+                                {
+                                    selfStat.NotHelpDirectDebitCapTradeAmt += TradeAmount;
+                                    selfStat.NotHelpDirectDebitCapNum += TradeCount;
+                                }
                             }
                         }
                         else if (BankCardType != 0)
@@ -1274,7 +1286,7 @@ namespace MySystem
                                 uids.Add(NavUserIdString + start);
                                 int NavUserId = int.Parse(NavUserIdString);
                                 function.WriteLog(NavUserId + ":team:" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行昨天交易额日志");
-                                DataTable teamDt = OtherMySqlConn.dtable("select BrandId,BankCardType,QrPayFlag,MerHelpFlag,sum(TradeAmount) from TradeRecord where Id>=" + startId + " and CreateDate>='" + start + "' and CreateDate<'" + end + "' and UserId in (select Id from Users where ParentNav like '%," + NavUserId + ",%' or Id=" + NavUserId + ") group by BrandId,BankCardType,QrPayFlag,MerHelpFlag");
+                                DataTable teamDt = OtherMySqlConn.dtable("select BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag,sum(TradeAmount),count(Id) from TradeRecord where Id>=" + startId + " and CreateDate>='" + start + "' and CreateDate<'" + end + "' and UserId in (select Id from Users where ParentNav like '%," + NavUserId + ",%' or Id=" + NavUserId + ") group by BrandId,BankCardType,QrPayFlag,MerHelpFlag,CapFlag");
                                 function.WriteLog(NavUserId + ":team:" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "\n\n", "执行昨天交易额日志");
                                 foreach (DataRow teamDr in teamDt.Rows)
                                 {
@@ -1282,7 +1294,9 @@ namespace MySystem
                                     int BankCardType = int.Parse(teamDr["BankCardType"].ToString());
                                     int QrPayFlag = int.Parse(teamDr["QrPayFlag"].ToString());
                                     int MerHelpFlag = int.Parse(teamDr["MerHelpFlag"].ToString());
-                                    decimal TradeAmount = decimal.Parse(teamDr[4].ToString());
+                                    int CapFlag = int.Parse(teamDr["CapFlag"].ToString());
+                                    decimal TradeAmount = decimal.Parse(teamDr[5].ToString());
+                                    int TradeCount = int.Parse(teamDr[6].ToString());
                                     TradeDaySummary teamStat = db.TradeDaySummary.FirstOrDefault(m => m.UserId == NavUserId && m.TradeMonth == TradeMonth && m.TradeDate == TradeDate && m.BrandId == BrandId && m.QueryCount == QrPayFlag && m.SeoTitle == "team");
                                     if (teamStat == null)
                                     {
@@ -1302,10 +1316,20 @@ namespace MySystem
                                         if(MerHelpFlag == 1)
                                         {
                                             teamStat.HelpNonDirectDebitTradeAmt += TradeAmount;
+                                            if(CapFlag == 1)
+                                            {
+                                                teamStat.HelpDirectDebitCapTradeAmt += TradeAmount;
+                                                teamStat.HelpDirectDebitCapNum += TradeCount;
+                                            }
                                         }
                                         else
                                         {
                                             teamStat.NotHelpNonDirectDebitTradeAmt += TradeAmount;
+                                            if(CapFlag == 1)
+                                            {
+                                                teamStat.NotHelpDirectDebitCapTradeAmt += TradeAmount;
+                                                teamStat.NotHelpDirectDebitCapNum += TradeCount;
+                                            }
                                         }
                                     }
                                     else if (BankCardType != 0)

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -179,6 +179,11 @@ namespace MySystem
                                                     }
                                                 }
                                             }
+                                            int CapFlag = 0;
+                                            if(BankCardType == 0 && TradeAmount >= 1666.67M)
+                                            {
+                                                CapFlag = 1;
+                                            }
                                             db.TradeRecord.Add(new PxcModels.TradeRecord()
                                             {
                                                 CreateDate = trade.CreateDate,
@@ -195,6 +200,7 @@ namespace MySystem
                                                 TradeAmount = TradeAmount, //交易金额
                                                 BankCardType = BankCardType, //银行卡类型
                                                 QrPayFlag = QrPayFlag, //云闪付标识
+                                                CapFlag = CapFlag, //借记卡是否封顶
                                                 BrandId = BrandId, //品牌
                                                 Remark = trade.Remark, //备注
                                                 TopUserId = TopUserId, //顶级创客