调整

AppStart/Redis/Mysql/MerchantAmountSummary.cs

@@ -71,7 +71,7 @@ namespace MySystem
             {
                 skipNum = PageSize * (PageNum - 1);
             }
-            DataTable dt = CustomerSqlConn.dtable("select TradeDate,sum(if(PayMode=1, TradeAmount, 0)),sum(if(PayMode=2, TradeAmount, 0)),sum(TradeAmount),sum(QueryCount) from MerchantAmountSummay where MerchantId=1 and TradeMonth='" + TradeMonth + "' group by TradeDate order by TradeDate desc limit " + skipNum + "," + PageSize, AppConfig.Base.SqlConnStr);
+            DataTable dt = CustomerSqlConn.dtable("select TradeDate,sum(if(PayMode=1, TradeAmount, 0)),sum(if(PayMode=2, TradeAmount, 0)),sum(TradeAmount),sum(TradeCount) from MerchantAmountSummay where MerchantId=" + MerchantId + " and TradeMonth='" + TradeMonth + "' group by TradeDate order by TradeDate desc limit " + skipNum + "," + PageSize, AppConfig.Base.SqlConnStr);
             return dt;
         }
 
@@ -82,7 +82,7 @@ namespace MySystem
             {
                 skipNum = PageSize * (PageNum - 1);
             }
-            DataTable dt = CustomerSqlConn.dtable("select TradeMonth,sum(if(PayMode=1, TradeAmount, 0)),sum(if(PayMode=2, TradeAmount, 0)),sum(TradeAmount),sum(QueryCount) from MerchantAmountSummay where MerchantId=1 group by TradeMonth order by TradeMonth desc limit " + skipNum + "," + PageSize, AppConfig.Base.SqlConnStr);
+            DataTable dt = CustomerSqlConn.dtable("select TradeMonth,sum(if(PayMode=1, TradeAmount, 0)),sum(if(PayMode=2, TradeAmount, 0)),sum(TradeAmount),sum(TradeCount) from MerchantAmountSummay where MerchantId=" + MerchantId + " group by TradeMonth order by TradeMonth desc limit " + skipNum + "," + PageSize, AppConfig.Base.SqlConnStr);
             return dt;
         }
     }

Areas/Api/Controllers/v1/MainServer/ConsumerOrdersController.cs

@@ -45,12 +45,13 @@ namespace MySystem.Areas.Api.Controllers.v1
             DataTable dt = MerchantAmountSummary.Instance.GetTradeListByDate(MerchantId, Month, PageNum, PageSize);
             foreach (DataRow dr in dt.Rows)
             {
+                string TradeDate = dr["TradeDate"].ToString();
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("Date", dr["TradeDate"].ToString()); //日期
-                curData.Add("Amount", dr[2].ToString()); //实收金额
-                curData.Add("WeChatAmount", dr[0].ToString()); //微信实收
+                curData.Add("Date", TradeDate.Substring(0, 4) + "-" + TradeDate.Substring(4, 2) + "-" + TradeDate.Substring(6, 2)); //日期
+                curData.Add("Amount", dr[3].ToString()); //实收金额
+                curData.Add("WeChatAmount", dr[2].ToString()); //微信实收
                 curData.Add("AlipayAmount", dr[1].ToString()); //微信实收
-                curData.Add("OrderCount", dr[3].ToString()); //订单数
+                curData.Add("OrderCount", dr[4].ToString()); //订单数
                 curData.Add("AddCount", 0); //新增会员
                 dataList.Add(curData);
             }
@@ -79,12 +80,13 @@ namespace MySystem.Areas.Api.Controllers.v1
             DataTable dt = MerchantAmountSummary.Instance.GetTradeListByMonth(MerchantId, PageNum, PageSize);
             foreach (DataRow dr in dt.Rows)
             {
+                string TradeDate = dr["TradeMonth"].ToString();
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("Date", dr["TradeMonth"].ToString()); //日期
-                curData.Add("Amount", dr[2].ToString()); //实收金额
-                curData.Add("WeChatAmount", dr[0].ToString()); //微信实收
+                curData.Add("Date", TradeDate.Substring(0, 4) + "-" + TradeDate.Substring(4, 2)); //日期
+                curData.Add("Amount", dr[3].ToString()); //实收金额
+                curData.Add("WeChatAmount", dr[2].ToString()); //微信实收
                 curData.Add("AlipayAmount", dr[1].ToString()); //微信实收
-                curData.Add("OrderCount", dr[3].ToString()); //订单数
+                curData.Add("OrderCount", dr[4].ToString()); //订单数
                 curData.Add("AddCount", 0); //新增会员
                 dataList.Add(curData);
             }
@@ -274,7 +276,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 PayMoney = PayMoney, //支付金额
                 SnNo = SnNo, //SN号
                 OrderNo = OrderNo,
-                MaxDivi = PayMoney * merchantset.DiviPercent * 100,
+                MaxDivi = PayMoney * merchantset.DiviPercent / 100,
                 IsAct = merchantset.IsAll == 1 ? 0u : 1u,
                 SeoDescription = Newtonsoft.Json.JsonConvert.SerializeObject(merchantset),
             }).Entity;

Areas/Api/Controllers/v1/MainServer/MerchantInfoController.cs

@@ -151,6 +151,10 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 query = query.Where(m => m.Name.Contains(SearchKey));
             }
+            if(Kind > 0)
+            {
+                query = query.Where(m => m.QueryCount == Kind);
+            }
             if (ActiveStatus > 0)
             {
                 if (ActiveStatus == 2) ActiveStatus = 0;
@@ -245,10 +249,11 @@ namespace MySystem.Areas.Api.Controllers.v1
         {
             value = DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
-            List<Dictionary<string, object>> dataList = MerchantTradeListDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+            Dictionary<string, object> other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = MerchantTradeListDo(value, out other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = other });
         }
-        public List<Dictionary<string, object>> MerchantTradeListDo(string value)
+        public List<Dictionary<string, object>> MerchantTradeListDo(string value, out Dictionary<string, object> other)
         {
             JsonData data = JsonMapper.ToObject(value);
             string TradeMonth = data["TradeMonth"].ToString(); //交易月
@@ -262,17 +267,38 @@ namespace MySystem.Areas.Api.Controllers.v1
                 int skipNum = PageSize * (PageNum - 1);
                 limit = " limit " + skipNum + "," + PageSize;
             }
-            DataTable dt = CustomerSqlConn.dtable("select TradeDate,sum(TradeAmount),sum(TradeCount),sum(if(IsAct=1, TradeAmount, 0)),sum(if(IsAct=1, TradeAmount, 0)) from MerchantAmountSummay where MerchantId=1 and TradeMonth='202304' group by TradeDate order by TradeDate desc" + limit, AppConfig.Base.SqlConnStr);
+            DataTable dt = CustomerSqlConn.dtable("select TradeDate,sum(TradeAmount),sum(TradeCount),sum(if(IsAct=1, TradeAmount, 0)),sum(if(IsAct=0, TradeAmount, 0)) from MerchantAmountSummay where MerchantId=" + MerchantId + " and TradeMonth='" + TradeMonth + "' group by TradeDate order by TradeDate desc" + limit, AppConfig.Base.SqlConnStr);
             foreach (DataRow dr in dt.Rows)
             {
+                string TradeDate = dr["TradeDate"].ToString();
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("TradeDate", dr["TradeDate"].ToString()); //交易日
+                curData.Add("TradeDate", TradeDate.Substring(0, 4) + "-" + TradeDate.Substring(4, 2) + "-" + TradeDate.Substring(6, 2)); //交易日
                 curData.Add("TradeAmt", dr[1].ToString()); //交易金额
                 curData.Add("ActTradeAmt", dr[3].ToString()); //活动交易金额
                 curData.Add("UnActTradeAmt", dr[4].ToString()); //非活动交易金额
                 curData.Add("TradeCount", dr[2].ToString()); //交易笔数
                 dataList.Add(curData);
             }
+            other = new Dictionary<string, object>();
+            if(PageNum == 1)
+            {
+                DataTable total = CustomerSqlConn.dtable("select sum(TradeAmount),sum(TradeCount),sum(if(IsAct=1, TradeAmount, 0)),sum(if(IsAct=0, TradeAmount, 0)) from MerchantAmountSummay where MerchantId=" + MerchantId + " and TradeMonth='" + TradeMonth + "'", AppConfig.Base.SqlConnStr);
+                decimal TradeAmt = 0;
+                decimal ActTradeAmt = 0;
+                decimal UnActTradeAmt = 0;
+                int TradeCount = 0;
+                if(total.Rows.Count > 0)
+                {
+                    TradeAmt = decimal.Parse(total.Rows[0][0].ToString()); //交易金额
+                    ActTradeAmt = decimal.Parse(total.Rows[0][2].ToString()); //活动交易金额
+                    UnActTradeAmt = decimal.Parse(total.Rows[0][3].ToString()); //非活动交易金额
+                    TradeCount = int.Parse(total.Rows[0][1].ToString()); //交易笔数
+                }
+                other.Add("TradeAmt", TradeAmt); //交易金额
+                other.Add("ActTradeAmt", ActTradeAmt); //活动交易金额
+                other.Add("UnActTradeAmt", UnActTradeAmt); //非活动交易金额
+                other.Add("TradeCount", TradeCount); //交易笔数
+            }
             return dataList;
         }
         #endregion
@@ -284,10 +310,11 @@ namespace MySystem.Areas.Api.Controllers.v1
         {
             value = DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
-            List<Dictionary<string, object>> dataList = QrCodeListDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+            int TotalCount = 0;
+            List<Dictionary<string, object>> dataList = QrCodeListDo(value, out TotalCount);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = TotalCount });
         }
-        public List<Dictionary<string, object>> QrCodeListDo(string value)
+        public List<Dictionary<string, object>> QrCodeListDo(string value, out int TotalCount)
         {
             JsonData data = JsonMapper.ToObject(value);
             int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
@@ -295,6 +322,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             IQueryable<MerchantQrCode> query = maindb.MerchantQrCode.Where(m => m.MerchantId == MerchantId).OrderByDescending(m => m.Id);
+            TotalCount = query.Count();
             if (PageNum == 1)
             {
                 query = query.Take(PageSize);
@@ -304,7 +332,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 int skipNum = PageSize * (PageNum - 1);
                 query = query.Skip(skipNum).Take(PageSize);
             }
-            foreach (MerchantQrCode item in query)
+            foreach (MerchantQrCode item in query.ToList())
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 curData.Add("SnNo", item.SnNo); //sn