经营数据记录(月)接口读取数据修复

Util/Business/BusinessUtil.cs

@@ -27,10 +27,10 @@ namespace MySystem
         {
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            if (!new MerchantTradeSummaryService().CheckTableExist(TradeMonth))
-            {
-                return dataList;
-            }
+            // if (!new MerchantTradeSummaryService().CheckTableExist(TradeMonth))
+            // {
+            //     return dataList;
+            // }
             // List<Dictionary<string, object>> source = MerchantTradeSummaryService.List2(relationData, " and MerchantId=" + MerchantId, TradeMonth, pageNum, pageSize,"TradeDate desc");
             // foreach (Dictionary<string, object> subdata in source)
             // {
@@ -46,12 +46,22 @@ namespace MySystem
             //     curData.Add("Kind", 2); //通道(1 直连 2 银联)
             //     dataList.Add(curData);
             // }
-            DataTable dt = CustomerSqlConn.dtable("select TradeDate,sum(TradeAmount) TotalAmount,sum(TotalActual) InFactAmount,sum(if(IsAct=1,TradeAmount,0)) ActAmount,sum(if(IsAct=0,TradeAmount,0)) NonActAmount,sum(if(PayMode=2,TotalActual,0)) WeChatInFactAmount,sum(if(PayMode=1,TotalActual,0)) AliPayInFactAmount,sum(TradeCount) OrderCount from MerchantAmountSummay where MerchantId=" + MerchantId + " group by TradeDate order by TradeDate desc;", AppConfig.Base.SqlConnStr);
+            string limit = " limit " + pageSize;
+            if(pageNum > 1)
+            {
+                int skip = (pageNum - 1) * pageSize;
+                limit = " limit " + skip + "," + pageSize;
+            }
+            DataTable dt = CustomerSqlConn.dtable("select TradeDate,sum(TradeAmount) TotalAmount,sum(TotalActual) InFactAmount,sum(if(IsAct=1,TradeAmount,0)) ActAmount,sum(if(IsAct=0,TradeAmount,0)) NonActAmount,sum(if(PayMode=2,TotalActual,0)) WeChatInFactAmount,sum(if(PayMode=1,TotalActual,0)) AliPayInFactAmount,sum(TradeCount) OrderCount from MerchantAmountSummay where MerchantId=" + MerchantId + " group by TradeDate order by TradeDate desc" + limit, AppConfig.Base.SqlConnStr);
+            if (dt.Rows.Count < 1)
+            {
+                return dataList;
+            }
             foreach (DataRow subdata in dt.Rows)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 curData.Add("TradeDate", subdata["TradeDate"].ToString()); //日期
-                curData.Add("TotalAmount", decimal.Parse(subdata["TradeAmount"].ToString()).ToString("f2")); //营业总金额
+                curData.Add("TotalAmount", decimal.Parse(subdata["TotalAmount"].ToString()).ToString("f2")); //营业总金额
                 curData.Add("InFactAmount", decimal.Parse(subdata["InFactAmount"].ToString()).ToString("f2")); //实收总金额
                 curData.Add("ActAmount", decimal.Parse(subdata["ActAmount"].ToString()).ToString("f2")); //活动总金额
                 curData.Add("NonActAmount", decimal.Parse(subdata["NonActAmount"].ToString()).ToString("f2")); //非活动总金额