修复商户交易统计问题

AppStart/Helper/StatNewService.cs

@@ -173,29 +173,26 @@ namespace MySystem
                 int PayMode = int.Parse(selfDr["PayMode"].ToString());
                 int IsAct = int.Parse(selfDr["IsAct"].ToString());
 
-                if (Kind == 2)
-                {
-                    TradeDate = TradeDate.Substring(0, 6);
-                }
+                string TradeMonth = TradeDate.Substring(0, 6);
 
-                if (string.IsNullOrEmpty(RedisDbconn.Instance.Get<string>("MerchantTradeSummaryList" + TradeDate.Substring(0, 6))))
+                if (string.IsNullOrEmpty(RedisDbconn.Instance.Get<string>("MerchantTradeSummaryList" + TradeMonth)))
                 {
-                    CustomerSqlConn.op(AppConfig.Base.CreateMerchantTradeSummaryList.Replace("#DateTime#", TradeDate.Substring(0, 6)), AppConfig.Base.StatSqlConn);
-                    RedisDbconn.Instance.Set("MerchantTradeSummaryList" + TradeDate.Substring(0, 6), "1");
+                    CustomerSqlConn.op(AppConfig.Base.CreateMerchantTradeSummaryList.Replace("#DateTime#", TradeMonth), AppConfig.Base.StatSqlConn);
+                    RedisDbconn.Instance.Set("MerchantTradeSummaryList" + TradeMonth, "1");
                     int sec = 3600 * 25;
                     if (Kind == 2)
                     {
                         sec = 3600 * 24 * 35;
                     }
-                    RedisDbconn.Instance.SetExpire("MerchantTradeSummaryList" + TradeDate.Substring(0, 6), sec);
+                    RedisDbconn.Instance.SetExpire("MerchantTradeSummaryList" + TradeMonth, sec);
                     Thread.Sleep(2000);
                 }
 
                 string Id = "0";
-                DataTable check = CustomerSqlConn.dtable("select Id from MerchantTradeSummaryList" + TradeDate.Substring(0, 6) + " where MerchantId=" + MerchantId + " and TradeDate='" + TradeDate.Substring(0, 6) + "'", AppConfig.Base.StatSqlConn);
+                DataTable check = CustomerSqlConn.dtable("select Id from MerchantTradeSummaryList" + TradeMonth + " where MerchantId=" + MerchantId + " and TradeDate='" + TradeDate + "'", AppConfig.Base.StatSqlConn);
                 if (check.Rows.Count < 1)
                 {
-                    check = CustomerSqlConn.dtable("insert into MerchantTradeSummaryList" + TradeDate.Substring(0, 6) + " (MerchantId,TradeDate) values (" + MerchantId + ",'" + TradeDate.Substring(0, 6) + "');select @@IDENTITY", AppConfig.Base.StatSqlConn);
+                    check = CustomerSqlConn.dtable("insert into MerchantTradeSummaryList" + TradeMonth + " (MerchantId,TradeDate) values (" + MerchantId + ",'" + TradeDate + "');select @@IDENTITY", AppConfig.Base.StatSqlConn);
                     if (check.Rows.Count > 0)
                     {
                         Id = check.Rows[0][0].ToString();
@@ -225,7 +222,7 @@ namespace MySystem
                 setField += "OderCount=OderCount+" + TradeCount + ","; // 订单数
                 setField += "InFactAmount=InFactAmount+" + MerchantActualAmount + ","; // 实收金额
                 setField += "TradeAmount=TradeAmount+" + PayMoney + ","; // 交易金额
-                CustomerSqlConn.op("update MerchantTradeSummaryList" + TradeDate.Substring(0, 6) + " set " + setField.TrimEnd(',') + " where Id=" + Id, AppConfig.Base.StatSqlConn);
+                CustomerSqlConn.op("update MerchantTradeSummaryList" + TradeMonth + " set " + setField.TrimEnd(',') + " where Id=" + Id, AppConfig.Base.StatSqlConn);
             }
             catch (Exception ex)
             {

AppStart/Helper/StatNewService2.cs

@@ -173,29 +173,26 @@ namespace MySystem
                 int PayMode = int.Parse(selfDr["PayMode"].ToString());
                 int IsAct = int.Parse(selfDr["IsAct"].ToString());
 
-                if (Kind == 2)
-                {
-                    TradeDate = TradeDate.Substring(0, 6);
-                }
+                string TradeMonth = TradeDate.Substring(0, 6);
 
-                if (string.IsNullOrEmpty(RedisDbconn.Instance.Get<string>("MerchantTradeSummaryList:2:" + TradeDate.Substring(0, 6))))
+                if (string.IsNullOrEmpty(RedisDbconn.Instance.Get<string>("MerchantTradeSummaryList:2:" + TradeMonth)))
                 {
-                    CustomerSqlConn.op(AppConfig.Base.CreateMerchantTradeSummaryList.Replace("#DateTime#", TradeDate.Substring(0, 6)), AppConfig.Base.StatSqlConn2);
-                    RedisDbconn.Instance.Set("MerchantTradeSummaryList:2:" + TradeDate.Substring(0, 6), "1");
+                    CustomerSqlConn.op(AppConfig.Base.CreateMerchantTradeSummaryList.Replace("#DateTime#", TradeMonth), AppConfig.Base.StatSqlConn2);
+                    RedisDbconn.Instance.Set("MerchantTradeSummaryList:2:" + TradeMonth, "1");
                     int sec = 3600 * 25;
                     if (Kind == 2)
                     {
                         sec = 3600 * 24 * 35;
                     }
-                    RedisDbconn.Instance.SetExpire("MerchantTradeSummaryList:2:" + TradeDate.Substring(0, 6), sec);
+                    RedisDbconn.Instance.SetExpire("MerchantTradeSummaryList:2:" + TradeMonth, sec);
                     Thread.Sleep(2000);
                 }
 
                 string Id = "0";
-                DataTable check = CustomerSqlConn.dtable("select Id from MerchantTradeSummaryList" + TradeDate.Substring(0, 6) + " where MerchantId=" + MerchantId + " and TradeDate='" + TradeDate.Substring(0, 6) + "'", AppConfig.Base.StatSqlConn2);
+                DataTable check = CustomerSqlConn.dtable("select Id from MerchantTradeSummaryList" + TradeMonth + " where MerchantId=" + MerchantId + " and TradeDate='" + TradeDate + "'", AppConfig.Base.StatSqlConn2);
                 if (check.Rows.Count < 1)
                 {
-                    check = CustomerSqlConn.dtable("insert into MerchantTradeSummaryList" + TradeDate.Substring(0, 6) + " (MerchantId,TradeDate) values (" + MerchantId + ",'" + TradeDate.Substring(0, 6) + "');select @@IDENTITY", AppConfig.Base.StatSqlConn2);
+                    check = CustomerSqlConn.dtable("insert into MerchantTradeSummaryList" + TradeMonth + " (MerchantId,TradeDate) values (" + MerchantId + ",'" + TradeDate + "');select @@IDENTITY", AppConfig.Base.StatSqlConn2);
                     if (check.Rows.Count > 0)
                     {
                         Id = check.Rows[0][0].ToString();
@@ -225,7 +222,7 @@ namespace MySystem
                 setField += "OderCount=OderCount+" + TradeCount + ","; // 订单数
                 setField += "InFactAmount=InFactAmount+" + MerchantActualAmount + ","; // 实收金额
                 setField += "TradeAmount=TradeAmount+" + PayMoney + ","; // 交易金额
-                CustomerSqlConn.op("update MerchantTradeSummaryList" + TradeDate.Substring(0, 6) + " set " + setField.TrimEnd(',') + " where Id=" + Id, AppConfig.Base.StatSqlConn2);
+                CustomerSqlConn.op("update MerchantTradeSummaryList" + TradeMonth + " set " + setField.TrimEnd(',') + " where Id=" + Id, AppConfig.Base.StatSqlConn2);
             }
             catch (Exception ex)
             {