暂存

Config/Base.cs

@@ -10,9 +10,11 @@ namespace AppConfig
         public static string Database = Library.ConfigurationManager.AppSettings["Database"].ToString();
         public static string defaultImage = Library.ConfigurationManager.AppSettings["Host"].ToString() + "/skin/app/default/static/images/default.jpg";
         public static string SqlConnStr = Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+        public static string StatConnRds = Library.ConfigurationManager.AppSettings["StatSqlConnStr"].ToString();
         
         #region 数据库结构
         public static Dictionary<string, Dictionary<string, string>> mainTables = new Dictionary<string, Dictionary<string, string>>();
+        public static Dictionary<string, Dictionary<string, string>> statTables = new Dictionary<string, Dictionary<string, string>>();
 
         #endregion
     }

Service/Main/MerchantTradeSummaryService.cs

@@ -78,6 +78,33 @@ namespace MySystem.Service.Main
             return diclist;
         }
 
+        public static List<Dictionary<string, object>> List2(List<RelationData> relationData, string condition, string TradeTime, int page = 1, int limit = 30, string orderBy = "Sort desc,Id desc")
+        {
+            List<string> fields = new List<string>(); //要显示的列
+            fields.Add("Id");
+            fields.Add("Sort");
+            fields.Add("QueryCount");
+            fields.Add("Status");
+            fields.Add("CreateDate");
+            fields.Add("UpdateDate");
+            fields.Add("SeoTitle");
+            fields.Add("SeoKeyword");
+            fields.Add("SeoDescription");
+            fields.Add("OderCount"); // 订单数
+            fields.Add("PayMode"); //支付方式
+            fields.Add("TradeAmount"); //订单金额
+            fields.Add("InFactAmount"); //实收金额
+            fields.Add("WeChatInFactAmount"); //微信实收金额
+            fields.Add("AliPayInFactAmount"); //支付宝实收金额
+            fields.Add("TradeDate"); //日期
+            fields.Add("TradeMonth"); //月份
+            fields.Add("MerchantId"); //商户Id
+
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.statTables, AppConfig.Base.StatConnRds).IndexData("MerchantTradeSummaryList" + TradeTime, relationData, orderBy, page, limit, condition, fields);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            return diclist;
+        }
+
         /// <summary>
         /// 查询一条记录
         /// </summary>

Util/Business/BusinessUtil.cs

@@ -26,8 +26,7 @@ namespace MySystem
         {
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            List<Dictionary<string, object>> source = MerchantTradeSummaryService.List(relationData, " and MerchantId=" + MerchantId, TradeMonth, pageNum, pageSize);
-            // var infos = UserTradeDbconn.GetDateTradeList(MerchantId,TradeMonth);
+            List<Dictionary<string, object>> source = MerchantTradeSummaryService.List2(relationData, " and MerchantId=" + MerchantId, TradeMonth, pageNum, pageSize);
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();

Util/HaoDa/UserTradeDbconn.cs

@@ -47,7 +47,7 @@ namespace MySystem
         public List<Dictionary<string, object>> GetDateTradeList(int MerchantId, string TradeMonth, string fields)
         {
             List<Dictionary<string, object>> AmtList = new List<Dictionary<string, object>>();
-            DataTable dt = CustomerSqlConn.dtable("select " + fields + " from MerchantTradeSummary" + TradeMonth + " where MerchantId=" + MerchantId + " and ", AppConfig.Base.StatConnRds);
+            DataTable dt = CustomerSqlConn.dtable("select " + fields + " from MerchantTradeSummary" + TradeMonth + " where MerchantId=" + MerchantId + " and Trade", AppConfig.Base.StatConnRds);
             if(dt.Rows.Count > 0)
             {
                 Dictionary<string, object> Item = new Dictionary<string, object>();
@@ -73,18 +73,25 @@ namespace MySystem
             string fieldList = "";
             foreach(string field in fields.Split(','))
             {
-                fieldList += "sum(" + fieldList + ") " + fieldList + ",";
+                fieldList += "sum(" + field + ") " + field + ",";
             }
             for(int i = 0; i < 6; i ++)
             {
                 Dictionary<string, object> Item = new Dictionary<string, object>();
                 Item.Add("TradeDate", DateTime.Now.AddMonths(-i).ToString("yyyy-MM"));
-                DataTable dt = CustomerSqlConn.dtable("select " + fieldList.TrimEnd(',') + " from MerchantTradeSummary" + DateTime.Now.AddMonths(-i).ToString("yyyyMM") + " where MerchantId=" + MerchantId + " and ", AppConfig.Base.StatConnRds);
+                DataTable dt = CustomerSqlConn.dtable("select " + fieldList.TrimEnd(',') + " from MerchantTradeSummary" + DateTime.Now.AddMonths(-i).ToString("yyyyMM") + " where MerchantId=" + MerchantId + "", AppConfig.Base.StatConnRds);
                 if(dt.Rows.Count > 0)
                 {
                     foreach(string field in fields.Split(','))
                     {
-                        Item.Add(field, dt.Rows[0][0].ToString());
+                        Item.Add(field, function.CheckNum(dt.Rows[0][0].ToString()));
+                    }
+                }
+                else
+                {
+                    foreach(string field in fields.Split(','))
+                    {
+                        Item.Add(field, "0");
                     }
                 }
                 AmtList.Add(Item);