Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/MainServer/ActiveRewardController.cs

@@ -60,7 +60,6 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("KqMerNo", "1"); //快钱商户编号
             Fields.Add("KqSnNo", "1"); //快钱SN号
             Fields.Add("TopUserId", "0"); //顶级创客
-
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
             ViewBag.BrandId = BrandId;
@@ -127,22 +126,66 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreName + "')";
             }
             //机具类型
-            if(!string.IsNullOrEmpty(SnTypeSelect))
+            if (!string.IsNullOrEmpty(SnTypeSelect))
             {
                 condition += " and SnType=" + SnTypeSelect;
             }
             //激活类型
-            if(!string.IsNullOrEmpty(ActTypeSelect))
+            if (!string.IsNullOrEmpty(ActTypeSelect))
             {
                 condition += " and ActType=" + ActTypeSelect;
             }
 
-            if(!string.IsNullOrEmpty(ActDateData))
+            // if(!string.IsNullOrEmpty(ActDateData))
+            // {
+            //     string[] datelist = ActDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+            //     string start = datelist[0];
+            //     string end = datelist[1];
+            //     condition += " and ActDate>='" + start + " 00:00:00' and ActDate<='" + end + " 23:59:59'";
+            // }
+            if (!string.IsNullOrEmpty(ActDateData))
             {
                 string[] datelist = ActDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                string start = datelist[0];
-                string end = datelist[1];
-                condition += " and ActDate>='" + start + " 00:00:00' and ActDate<='" + end + " 23:59:59'";
+                // string start = datelist[0];
+                // string end = datelist[1];
+                // condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+                var start = Convert.ToDateTime(Convert.ToDateTime(datelist[0]).ToString("yyyy-MM-dd"));
+                var end = Convert.ToDateTime(Convert.ToDateTime(datelist[1]).ToString("yyyy-MM-dd") + " 23:59:59");
+                var check = db.ActiveReward.Any(m => m.ActDate >= start && m.BrandId == Convert.ToInt32(BrandId));
+                var checks = db.ActiveReward.Any(m => m.ActDate <= end && m.BrandId == Convert.ToInt32(BrandId));
+                if (check)
+                {
+                    var sId = db.ActiveReward.Where(m => m.ActDate >= start && m.BrandId == Convert.ToInt32(BrandId)).Min(m => m.Id);
+                    condition += "  and Id >=" + sId;
+                }
+                if (checks)
+                {
+                    var eId = db.ActiveReward.Where(m => m.ActDate <= end && m.BrandId == Convert.ToInt32(BrandId)).Max(m => m.Id);
+                    condition += " and Id <=" + eId;
+                }
+            }
+            else
+            {
+                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"));
+                var check = db.ActiveReward.Any(m => m.ActDate >= start && m.BrandId == Convert.ToInt32(BrandId));
+                if (check)
+                {
+                    var minId = db.ActiveReward.Where(m => m.ActDate >= start && m.BrandId == Convert.ToInt32(BrandId)).Min(m => m.Id);
+                    var Info = function.ReadInstance("/WritePage/ActiveReward/ActiveReward" + BrandId + ".txt");
+                    if (string.IsNullOrEmpty(Info))
+                    {
+                        function.WritePage("/WritePage/ActiveReward/", "ActiveReward" + BrandId + ".txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
+                    else
+                    {
+                        condition += " and Id >=" + Convert.ToInt32(Info);
+                    }
+                }
+                else
+                {
+                    condition += " and Id =0";
+                }
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ActiveReward", Fields, "Id desc", "0", page, limit, condition);
@@ -191,15 +234,15 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreName"] = store.StoreName;
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if(SnType == 0) dic["SnType"] = "购买机具";
-                if(SnType == 1) dic["SnType"] = "赠送机具";
+                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 1) dic["SnType"] = "赠送机具";
                 //激活类型
                 int ActType = int.Parse(dic["ActType"].ToString());
-                if(ActType == 0) dic["ActType"] = "正常激活";
-                if(ActType == 1) dic["ActType"] = "首次已激活MPOS";
-                if(ActType == 2) dic["ActType"] = "首次已激活KPOS";
-                if(ActType == 3) dic["ActType"] = "循环机划拨激活";
-            }            
+                if (ActType == 0) dic["ActType"] = "正常激活";
+                if (ActType == 1) dic["ActType"] = "首次已激活MPOS";
+                if (ActType == 2) dic["ActType"] = "首次已激活KPOS";
+                if (ActType == 3) dic["ActType"] = "循环机划拨激活";
+            }
             Dictionary<string, object> other = new Dictionary<string, object>();
             string RewardAmount = "0.00";//奖励金额
             DataTable dt = OtherMySqlConn.dtable("select sum(RewardAmount) from ActiveReward where BrandId='" + ViewBag.BrandId + "'" + condition);
@@ -486,12 +529,12 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreName + "')";
             }
             //机具类型
-            if(!string.IsNullOrEmpty(SnTypeSelect))
+            if (!string.IsNullOrEmpty(SnTypeSelect))
             {
                 condition += " and SnType=" + SnTypeSelect;
             }
             //激活类型
-            if(!string.IsNullOrEmpty(ActTypeSelect))
+            if (!string.IsNullOrEmpty(ActTypeSelect))
             {
                 condition += " and ActType=" + ActTypeSelect;
             }
@@ -542,14 +585,14 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreName"] = store.StoreName;
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if(SnType == 0) dic["SnType"] = "购买机具";
-                if(SnType == 1) dic["SnType"] = "赠送机具";
+                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 1) dic["SnType"] = "赠送机具";
                 //激活类型
                 int ActType = int.Parse(dic["ActType"].ToString());
-                if(ActType == 0) dic["ActType"] = "正常激活";
-                if(ActType == 1) dic["ActType"] = "首次已激活MPOS";
-                if(ActType == 2) dic["ActType"] = "首次已激活KPOS";
-                if(ActType == 3) dic["ActType"] = "循环机划拨激活";
+                if (ActType == 0) dic["ActType"] = "正常激活";
+                if (ActType == 1) dic["ActType"] = "首次已激活MPOS";
+                if (ActType == 2) dic["ActType"] = "首次已激活KPOS";
+                if (ActType == 3) dic["ActType"] = "循环机划拨激活";
                 dic.Remove("MerchantId");
                 dic.Remove("UserId");
                 dic.Remove("MerUserId");

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -51,13 +51,26 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具库列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(PosMachinesTwo data, string BindingStateSelect, string ActivationStateSelect, string UserIdMakerCode, string UserIdRealName, string StoreIdCode, string StoreIdName, string BrandId, string ActivationDateData, string BindingDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(PosMachinesTwo data, string BindingStateSelect, string ActivationStateSelect, string UserIdMakerCode, string UserIdRealName, string StoreIdCode, string StoreIdName, string BrandId, string ActivationDateData, string BindingDateData, int ShowFlag = 0, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             Fields.Add("PosSn", "1"); //SN编号
             Fields.Add("BrandId", "0"); //品牌
+            if (ShowFlag == 0)
+            {
+                Dictionary<string, object> objs = new Dictionary<string, object>();
+
+                Dictionary<string, object> others = new Dictionary<string, object>();
+                others.Add("TotalCount", 0);
+                others.Add("KysCount99", 0);
+                others.Add("KssCount99", 0);
+                others.Add("KssCoun198", 0);
+                others.Add("KssCount298", 0);
+                objs.Add("other", others);
+                return Json(objs);
+            }
 
 
             string condition = " and Status>-1";

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -51,10 +51,15 @@ namespace MySystem.Areas.Admin.Controllers
         /// 商户列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(PosMerchantInfo data, string MerIdcardNo, string MerchantName, string PhoneNo, int page = 1, int limit = 30)
+        public JsonResult IndexData(PosMerchantInfo data, string MerIdcardNo, string MerchantName, string PhoneNo, int ShowFlag = 0, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
+            if (ShowFlag == 0)
+            {
+                Dictionary<string, object> objs = new Dictionary<string, object>();
+                return Json(objs);
+            }
 
             string condition = " and Status>-1";
             //身份证号

Areas/Admin/Controllers/MainServer/ProfitRewardRecordController.cs

@@ -64,16 +64,13 @@ namespace MySystem.Areas.Admin.Controllers
         /// 分润奖励记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ProfitRewardRecord data, string right, string BrandId, string MakerCode, string RealName, string ProfitTypeSelect, string CheckStatusSelect, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(ProfitRewardRecord data, string MakerCode, string RealName, string ProfitTypeSelect, string CheckStatusSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             Fields.Add("BrandId", "1");
             Fields.Add("TopUserId", "0"); //顶级创客
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.BrandId = BrandId;
 
             string condition = " and Status>-1";
             //创客编号
@@ -87,22 +84,63 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //创客分润类型
-            if(!string.IsNullOrEmpty(ProfitTypeSelect))
+            if (!string.IsNullOrEmpty(ProfitTypeSelect))
             {
                 condition += " and ProfitType=" + ProfitTypeSelect;
             }
             //验证和同步账户状态
-            if(!string.IsNullOrEmpty(CheckStatusSelect))
+            if (!string.IsNullOrEmpty(CheckStatusSelect))
             {
                 condition += " and CheckStatus=" + CheckStatusSelect;
             }
             //交易时间
-            if(!string.IsNullOrEmpty(CreateDateData))
+            // if(!string.IsNullOrEmpty(CreateDateData))
+            // {
+            //     string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+            //     string start = datelist[0];
+            //     string end = datelist[1];
+            //     condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            // }
+            if (!string.IsNullOrEmpty(CreateDateData))
             {
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                string start = datelist[0];
-                string end = datelist[1];
-                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+                var start = Convert.ToDateTime(Convert.ToDateTime(datelist[0]).ToString("yyyy-MM-dd"));
+                var end = Convert.ToDateTime(Convert.ToDateTime(datelist[1]).ToString("yyyy-MM-dd") + " 23:59:59");
+                var check = db.ProfitRewardRecord.Any(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId));
+                var checks = db.ProfitRewardRecord.Any(m => m.CreateDate <= end && m.BrandId == Convert.ToInt32(BrandId));
+                if (check)
+                {
+                    var sId = db.ProfitRewardRecord.Where(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId)).Min(m => m.Id);
+                    condition += "  and Id >=" + sId;
+                }
+                if (checks)
+                {
+                    var eId = db.ProfitRewardRecord.Where(m => m.CreateDate <= end && m.BrandId == Convert.ToInt32(BrandId)).Max(m => m.Id);
+                    condition += " and Id <=" + eId;
+                }
+            }
+            else
+            {
+                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"));
+                var check = db.ProfitRewardRecord.Any(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId));
+                if (check)
+                {
+                    var minId = db.ProfitRewardRecord.Where(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId)).Min(m => m.Id);
+                    var Info = function.ReadInstance("/WritePage/ProfitRewardRecord/ProfitRewardRecord.txt");
+                    if (string.IsNullOrEmpty(Info.ToString()))
+                    {
+                        function.WritePage("/WritePage/ProfitRewardRecord/", "ProfitRewardRecord.txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
+                    else
+                    {
+                        condition += " and Id >=" + Convert.ToInt32(Info);
+                    }
+                }
+                else
+                {
+                    condition += " and Id =0";
+                }
             }
 
             // TODO: 读取太慢，要优化
@@ -122,13 +160,13 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["TopRealName"] = tuser.RealName;
                 //创客分润类型
                 int ProfitType = int.Parse(dic["ProfitType"].ToString());
-                if(ProfitType == 0) dic["ProfitType"] = "直营商户交易分润";
-                if(ProfitType == 1) dic["ProfitType"] = "团队交易分润";
-                if(ProfitType == 2) dic["ProfitType"] = "其他";
+                if (ProfitType == 0) dic["ProfitType"] = "直营商户交易分润";
+                if (ProfitType == 1) dic["ProfitType"] = "团队交易分润";
+                if (ProfitType == 2) dic["ProfitType"] = "其他";
                 //创客分润类型
                 int CheckStatus = int.Parse(dic["CheckStatus"].ToString());
-                if(CheckStatus == 0) dic["CheckStatus"] = "初始";
-                if(CheckStatus == 1) dic["CheckStatus"] = "已验证和同步";
+                if (CheckStatus == 0) dic["CheckStatus"] = "初始";
+                if (CheckStatus == 1) dic["CheckStatus"] = "已验证和同步";
 
                 //其他产品交易额(元)
                 string OtherTradeAmt = "";
@@ -178,26 +216,14 @@ namespace MySystem.Areas.Admin.Controllers
             string MerchantProfitAmount = "0.00";//商户交易分润总金额
             string CreditProfitAmount = "0.00";//贷记卡分润总金额
             // TODO: 读取太慢，要优化
-            // DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmt) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     MerchantTradeAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(CreditTradeAmt) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     CreditTradeAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TradeProfit) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     MerchantProfitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(CreditTradeProfit) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     CreditProfitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
-            // }
+            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(if(BrandId="+ViewBag.BrandId+",TradeAmt,0)),SUM(if(BrandId="+ViewBag.BrandId+",CreditTradeAmt,0)),SUM(if(BrandId="+ViewBag.BrandId+",TradeProfit,0)),SUM(if(BrandId="+ViewBag.BrandId+",CreditTradeProfit,0)) FROM ProfitRewardRecord where 1=1 " + condition);
+            if (dt.Rows.Count > 0)
+            {
+                MerchantTradeAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
+                CreditTradeAmount = decimal.Parse(function.CheckNum(dt.Rows[0][1].ToString())).ToString();
+                MerchantProfitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][2].ToString())).ToString();
+                CreditProfitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][3].ToString())).ToString();
+            }
             other.Add("MerchantTradeAmount", MerchantTradeAmount);
             other.Add("CreditTradeAmount", CreditTradeAmount);
             other.Add("MerchantProfitAmount", MerchantProfitAmount);
@@ -428,12 +454,12 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //创客分润类型
-            if(!string.IsNullOrEmpty(ProfitTypeSelect))
+            if (!string.IsNullOrEmpty(ProfitTypeSelect))
             {
                 condition += " and ProfitType=" + ProfitTypeSelect;
             }
             //验证和同步账户状态
-            if(!string.IsNullOrEmpty(CheckStatusSelect))
+            if (!string.IsNullOrEmpty(CheckStatusSelect))
             {
                 condition += " and CheckStatus=" + CheckStatusSelect;
             }
@@ -454,13 +480,13 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["TopRealName"] = tuser.RealName;
                 //创客分润类型
                 int ProfitType = int.Parse(dic["ProfitType"].ToString());
-                if(ProfitType == 0) dic["ProfitType"] = "直营商户交易分润";
-                if(ProfitType == 1) dic["ProfitType"] = "团队交易分润";
-                if(ProfitType == 2) dic["ProfitType"] = "其他";
+                if (ProfitType == 0) dic["ProfitType"] = "直营商户交易分润";
+                if (ProfitType == 1) dic["ProfitType"] = "团队交易分润";
+                if (ProfitType == 2) dic["ProfitType"] = "其他";
                 //创客分润类型
                 int CheckStatus = int.Parse(dic["CheckStatus"].ToString());
-                if(CheckStatus == 0) dic["CheckStatus"] = "初始";
-                if(CheckStatus == 1) dic["CheckStatus"] = "已验证和同步";
+                if (CheckStatus == 0) dic["CheckStatus"] = "初始";
+                if (CheckStatus == 1) dic["CheckStatus"] = "已验证和同步";
                 dic.Remove("UserId");
                 dic.Remove("TopUserId");
             }
@@ -517,7 +543,7 @@ namespace MySystem.Areas.Admin.Controllers
         {
             string date = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
             string OpTypeString = "";
-            if(OpType > 0)
+            if (OpType > 0)
             {
                 OpTypeString += "-" + OpType;
             }
@@ -537,7 +563,7 @@ namespace MySystem.Areas.Admin.Controllers
         {
             string date = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
             string OpTypeString = "";
-            if(OpType > 0)
+            if (OpType > 0)
             {
                 OpTypeString += "-" + OpType;
             }
@@ -555,7 +581,7 @@ namespace MySystem.Areas.Admin.Controllers
 
         //交易分润
         private void DoTradeProfitByCondi(int Id, int BrandId, string date, int OpType = 0)
-        { 
+        {
             int OpTypeDo = OpType + 1;
             WebCMSEntities db = new WebCMSEntities();
             OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString();
@@ -647,7 +673,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
         //分润补贴
         private void DoSubsidyProfitByCondi(int Id, int BrandId, string date, int OpType = 0)
-        { 
+        {
             int OpTypeDo = OpType + 1;
             WebCMSEntities db = new WebCMSEntities();
             OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString();

Areas/Admin/Controllers/MainServer/ProfitSubsidyDetailController.cs

@@ -85,17 +85,61 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and SubsidyUserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //分润补贴类型
-            if(!string.IsNullOrEmpty(SubsidyTypeSelect))
+            if (!string.IsNullOrEmpty(SubsidyTypeSelect))
             {
                 condition += " and SubsidyType=" + SubsidyTypeSelect;
             }
             //交易月份
-            if(!string.IsNullOrEmpty(TradeMonthSelect))
+            // if(!string.IsNullOrEmpty(TradeMonthSelect))
+            // {
+            //     condition += " and TradeMonth=" + TradeMonthSelect.Replace("-", "");
+            // }
+            if (!string.IsNullOrEmpty(TradeMonthSelect))
             {
-                condition += " and TradeMonth=" + TradeMonthSelect.Replace("-", "");
+                string[] datelist = TradeMonthSelect.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                condition += " and TradeMonth=" + start;
+
+                // var check = db.ProfitSubsidyDetail.Any(m => Convert.ToInt32(m.TradeMonth) >= Convert.ToInt32(start));
+                // var checks = db.ProfitSubsidyDetail.Any(m => Convert.ToInt32(m.TradeMonth) <= Convert.ToInt32(end));
+                // if (check)
+                // {
+                //     var sId = db.ProfitSubsidyDetail.Where(m => Convert.ToInt32(m.TradeMonth) >= Convert.ToInt32(start)).Min(m => m.Id);
+                //     condition += "  and Id >=" + sId;
+                // }
+                // if (checks)
+                // {
+                //     var eId = db.ProfitSubsidyDetail.Where(m => Convert.ToInt32(m.TradeMonth) <= Convert.ToInt32(start)).Max(m => m.Id);
+                //     condition += " and Id <=" + eId;
+                // }
+            }
+            else
+            {
+                var start = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
+                condition += " and TradeMonth=" + start;
+
+                // var check = db.ProfitSubsidyDetail.Any(m => Convert.ToInt32(m.TradeMonth) >= Convert.ToInt32(start));
+                // if (check)
+                // {
+                //     var minId = db.ProfitSubsidyDetail.Where(m => Convert.ToInt32(m.TradeMonth) >= Convert.ToInt32(start)).Min(m => m.Id);
+                //     var Info = Convert.ToInt32(function.ReadInstance("/WritePage/ProfitSubsidyDetail/ProfitSubsidyDetail.txt"));
+                //     if (string.IsNullOrEmpty(Info.ToString()))
+                //     {
+                //         function.WritePage("/WritePage/ProfitSubsidyDetail/", "ProfitSubsidyDetail.txt", minId.ToString());
+                //         condition += " and Id >=" + minId;
+                //     }
+                //     else
+                //     {
+                //         condition += " and Id >=" + Info;
+                //     }
+                // }
+                // else
+                // {
+                //     condition += " and Id =0";
+                // }
             }
             //产品类型
-            if(!string.IsNullOrEmpty(BrandIdSelect))
+            if (!string.IsNullOrEmpty(BrandIdSelect))
             {
                 condition += " and BrandId=" + BrandIdSelect;
             }
@@ -363,12 +407,12 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and SubsidyUserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //分润补贴类型
-            if(!string.IsNullOrEmpty(SubsidyTypeSelect))
+            if (!string.IsNullOrEmpty(SubsidyTypeSelect))
             {
                 condition += " and SubsidyType=" + SubsidyTypeSelect;
             }
             //交易月份
-            if(!string.IsNullOrEmpty(TradeMonthSelect))
+            if (!string.IsNullOrEmpty(TradeMonthSelect))
             {
                 condition += " and TradeMonth=" + TradeMonthSelect.Replace("-", "");
             }

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -52,7 +52,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 仓库列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(StoreHouse data, string UserIdMakerCode, string UserIdRealName, string ManageUserIdRealName, string ManageUserIdMobile, string ManageUserIdMakerCode, string StoreStatusSelect, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(StoreHouse data, string UserIdMakerCode, string UserIdRealName, string ManageUserIdRealName, string ManageUserIdMobile, string ManageUserIdMakerCode, string StoreStatusSelect, string CreateDateData, int ShowFlag = 0, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -60,7 +60,11 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("StoreNo", "1"); //仓库编号
             Fields.Add("StoreName", "1"); //仓库名称
             Fields.Add("ManagerEmail", "1"); //管理者邮箱
-
+            if (ShowFlag == 0)
+            {
+                Dictionary<string, object> objs = new Dictionary<string, object>();
+                return Json(objs);
+            }
 
             string condition = " and Status>-1";
             //仓库归属人创客编号
@@ -175,11 +179,16 @@ namespace MySystem.Areas.Admin.Controllers
                 var ValidAmount = amount.ValidAmount;
                 var FixedAmount = amount.FixedAmount;
                 var TempAmount = amount.TempAmount;
-                var LeaderBalanceAmount = amount.LeaderBalanceAmount;
+                var check = db.StoreHouseAmountPromiss.Any(m => m.ToUserId == UserId);
+                decimal PromissAmount = 0;
+                if (check)
+                {
+                    PromissAmount = db.StoreHouseAmountPromiss.Where(m => m.Status == 1 && m.ToUserId == UserId).Sum(m => m.PromissAmount);
+                }
                 dic["ValidAmount"] = ValidAmount.ToString();//可用额度
                 dic["FixedAmount"] = FixedAmount.ToString();//固定额度
                 dic["TempAmount"] = TempAmount.ToString();//临时额度
-                dic["LeaderBalanceAmount"] = LeaderBalanceAmount.ToString();//担保金额
+                dic["PromissAmount"] = PromissAmount.ToString();//担保金额
             }
             return Json(obj);
         }
@@ -272,7 +281,7 @@ namespace MySystem.Areas.Admin.Controllers
                         RedisDbconn.Instance.Set("StoreForCode:" + No, Id);
                     }
                     StoreForName storeForName = db.StoreForName.FirstOrDefault(m => m.Name == data.StoreName);
-                    if(storeForName == null)
+                    if (storeForName == null)
                     {
                         db.StoreForName.Add(new StoreForName()
                         {
@@ -476,7 +485,7 @@ namespace MySystem.Areas.Admin.Controllers
                 RedisDbconn.Instance.Set("StoreForCode:" + No, Id);
             }
             StoreForName storeForName = db.StoreForName.FirstOrDefault(m => m.Name == data.StoreName);
-            if(storeForName == null)
+            if (storeForName == null)
             {
                 db.StoreForName.Add(new StoreForName()
                 {
@@ -731,7 +740,7 @@ namespace MySystem.Areas.Admin.Controllers
                         var user = db.Users.FirstOrDefault(m => m.Id == toStore.UserId) ?? new Users();
                         var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == toStore.UserId) ?? new UserAccount();
                         var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == Convert.ToInt32(BrandId)) ?? new KqProducts();
-                        var fuserMachineData = db.UserMachineData.FirstOrDefault(m => m.IdBrand == userForMakerCode.UserId+ "_" + brandInfo.Id);
+                        var fuserMachineData = db.UserMachineData.FirstOrDefault(m => m.IdBrand == userForMakerCode.UserId + "_" + brandInfo.Id);
                         if (brandInfo.Name.Contains("电签"))
                         {
                             amount = 200;

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -468,11 +468,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 int num = Convert.ToInt32(ApplyList[i]["ApplyNum"].ToString());
                 int BrandIds = Convert.ToInt32(ApplyList[i]["BrandId"].ToString());
-                if (BrandIds == 1 || BrandIds == 2 || BrandIds == 4 || BrandIds == 6 || BrandIds == 7 || BrandIds == 8)
+                //自动匹配品牌
+                var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == BrandIds);
+                if (brandInfo.Name.Contains("电签"))
                 {
                     ApplyAmount += num * 200;
                 }
-                if (BrandIds == 3 || BrandIds == 5 || BrandIds == 9)
+                if (brandInfo.Name.Contains("大POS"))
                 {
                     ApplyAmount += num * 300;
                 }
@@ -484,7 +486,10 @@ namespace MySystem.Areas.Admin.Controllers
             var BrandId = 0;
             var FromStoreId = 0;
             string error = "";
-
+            if (string.IsNullOrEmpty(ExcelData))
+            {
+                return "Warning|" + "请选择要导入的数据";
+            }
             ExcelData = HttpUtility.UrlDecode(ExcelData);
             JsonData list = JsonMapper.ToObject(ExcelData);
             List<string> PosSnList = new List<string>();
@@ -580,7 +585,7 @@ namespace MySystem.Areas.Admin.Controllers
                 PosMachinesTwo machine = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machinefor.SnId && m.BuyUserId == 0 && m.UserId == 0) ?? new PosMachinesTwo();
                 if (machine.Id > 0)
                 {
-                    if(machine.BrandId != BrandId)
+                    if (machine.BrandId != BrandId)
                     {
                         return machine.PosSn + "与表格里填写的品牌不一致";
                     }

Areas/Admin/Controllers/MainServer/SysRechargeRecordController.cs

@@ -128,25 +128,13 @@ namespace MySystem.Areas.Admin.Controllers
             string BizAmount31 = "0.00";//活动奖励
             string BizAmount114 = "0.00";//私董会分红
             string BizAmount115 = "0.00";//分仓奖励
-            DataTable dt = OtherMySqlConn.dtable("select sum(Amount) from SysRechargeRecord where BizType=30" + condition);
+            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(if(BizType=30,Amount,0)),SUM(if(BizType=31,Amount,0)),SUM(if(BizType=114,Amount,0)),SUM(if(BizType=115,Amount,0)) FROM SysRechargeRecord where 1=1 " + condition);
             if (dt.Rows.Count > 0)
             {
                 BizAmount30 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(Amount) from SysRechargeRecord where BizType=31" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                BizAmount31 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(Amount) from SysRechargeRecord where BizType=114" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                BizAmount114 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(Amount) from SysRechargeRecord where BizType=115" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                BizAmount115 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+                BizAmount31 = decimal.Parse(function.CheckNum(dt.Rows[0][1].ToString())).ToString("f2");
+                BizAmount114 = decimal.Parse(function.CheckNum(dt.Rows[0][2].ToString())).ToString("f2");
+                BizAmount115 = decimal.Parse(function.CheckNum(dt.Rows[0][3].ToString())).ToString("f2");
             }
             other.Add("BizAmount30", BizAmount30);
             other.Add("BizAmount31", BizAmount31);

Areas/Admin/Controllers/MainServer/TradeDaySummaryController.cs

@@ -77,13 +77,82 @@ namespace MySystem.Areas.Admin.Controllers
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
                 string start = datelist[0].Replace("-", "");
                 string end = datelist[1].Replace("-", "");
-                condition += " and TradeDate >= '" + start + "' and TradeDate <= '" + end + "' ";
+                condition += " and TradeDate >= " + start + " and TradeDate <= " + end + " ";
+
+                // var check = db.TradeDaySummary.Any(m => Convert.ToInt32(m.TradeDate) >= Convert.ToInt32(start));
+                // var checks = db.TradeDaySummary.Any(m => Convert.ToInt32(m.TradeDate) <= Convert.ToInt32(end));
+                // if (check)
+                // {
+                //     var sId = db.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) >= Convert.ToInt32(start)).Min(m => m.Id);
+                //     condition += "  and Id >=" + sId;
+                // }
+                // if (checks)
+                // {
+                //     var eId = db.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) <= Convert.ToInt32(end)).Max(m => m.Id);
+                //     condition += " and Id <=" + eId;
+                // }
             }
+            // else
+            // {
+            //     var start = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
+            //     condition += " and TradeMonth >= " + Convert.ToInt32(start);
+                
+            //     // var check = db.TradeDaySummary.Any(m => Convert.ToInt32(m.TradeDate) >= Convert.ToInt32(start));
+            //     // if (check)
+            //     // {
+            //     //     var minId = db.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) >= Convert.ToInt32(start)).Min(m => m.Id);
+            //     //     var Info = Convert.ToInt32(function.ReadInstance("/WritePage/TradeDaySummary/TradeDaySummarys.txt"));
+            //     //     if (string.IsNullOrEmpty(Info.ToString()))
+            //     //     {
+            //     //         function.WritePage("/WritePage/TradeDaySummary/", "TradeDaySummarys.txt", minId.ToString());
+            //     //         condition += " and Id >=" + minId;
+            //     //     }
+            //     //     else
+            //     //     {
+            //     //         condition += " and Id >=" + Info;
+            //     //     }
+            //     // }
+            //     // else
+            //     // {
+            //     //     condition += " and Id =0";
+            //     // }
+            // }
             //交易月份
             if(!string.IsNullOrEmpty(TradeMonthSelect))
             {
                 condition += " and TradeMonth=" + TradeMonthSelect.Replace("-", "");
             }
+            // if (!string.IsNullOrEmpty(TradeMonthSelect))
+            // {
+            //     string[] datelist = TradeMonthSelect.Split(new string[] { " - " }, StringSplitOptions.None);
+            //     string start = datelist[0];
+            //     condition += " and TradeMonth = " + start;
+
+            //     // var check = db.TradeDaySummary.Any(m => Convert.ToInt32(m.TradeMonth) >= Convert.ToInt32(start));
+            //     // if (check)
+            //     // {
+            //     //     var sId = db.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeMonth) >= Convert.ToInt32(start)).Min(m => m.Id);
+            //     //     var eId = db.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeMonth) <= Convert.ToInt32(start)).Max(m => m.Id);
+            //     //     condition += "  and Id >=" + sId + " and Id <=" + eId;
+            //     // }
+            // }
+            // else
+            // {
+            //     var start = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
+            //     condition += " and TradeMonth >= " + Convert.ToInt32(start);
+
+            //     // var minId = db.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeMonth) >= Convert.ToInt32(start)).Min(m => m.Id);
+            //     // var Info = Convert.ToInt32(function.ReadInstance("/WritePage/TradeDaySummary/TradeDaySummary.txt"));
+            //     // if (string.IsNullOrEmpty(Info.ToString()))
+            //     // {
+            //     //     function.WritePage("/WritePage/TradeDaySummary/", "TradeDaySummary.txt", minId.ToString());
+            //     //     condition += " and Id >=" + minId;
+            //     // }
+            //     // else
+            //     // {
+            //     //     condition += " and Id >=" + Info;
+            //     // }
+            // }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("TradeDaySummary", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -105,25 +174,13 @@ namespace MySystem.Areas.Admin.Controllers
             string HelpNonDirectTradeAmt = "0.00";//扶持期非直营商户交易总额
             string NotHelpDirectTradeAmt = "0.00";//非扶持期直营商户交易总额
             string NotHelpNonDirectTradeAmt = "0.00";//非扶持期非直营商户交易总额
-            DataTable dt = OtherMySqlConn.dtable("select sum(HelpDirectTradeAmt) from TradeDaySummary  where 1=1" + condition);
+            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(HelpDirectTradeAmt),SUM(HelpNonDirectTradeAmt),SUM(NotHelpDirectTradeAmt),SUM(NotHelpNonDirectTradeAmt) FROM TradeDaySummary where 1=1" + condition);
             if (dt.Rows.Count > 0)
             {
                 HelpDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(HelpNonDirectTradeAmt) from TradeDaySummary  where 1=1" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                HelpNonDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(NotHelpDirectTradeAmt) from TradeDaySummary  where 1=1" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                NotHelpDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(NotHelpNonDirectTradeAmt) from TradeDaySummary  where 1=1" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                NotHelpNonDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+                HelpNonDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][1].ToString())).ToString("f2");
+                NotHelpDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][2].ToString())).ToString("f2");
+                NotHelpNonDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][3].ToString())).ToString("f2");
             }
             other.Add("HelpDirectTradeAmt", HelpDirectTradeAmt);
             other.Add("HelpNonDirectTradeAmt", HelpNonDirectTradeAmt);
@@ -355,7 +412,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //交易月份
-            if(!string.IsNullOrEmpty(TradeMonthSelect))
+            if (!string.IsNullOrEmpty(TradeMonthSelect))
             {
                 condition += " and TradeMonth=" + TradeMonthSelect.Replace("-", "");
             }

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -56,9 +56,6 @@ namespace MySystem.Areas.Admin.Controllers
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.BrandId = BrandId;
 
             Fields.Add("BrandId", "1");
             Fields.Add("MerNo", "2"); //快钱商户编号
@@ -66,11 +63,6 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("TopUserId", "0"); //顶级创客
 
             string condition = " and Status>-1";
-
-            if(!string.IsNullOrEmpty(ViewBag.BrandId))
-            {
-                condition += " and BrandId=" + ViewBag.BrandId;
-            }
             //商户编号
             if (!string.IsNullOrEmpty(MerchantNo))
             {
@@ -113,21 +105,65 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and SnNo='" + SnNo + "'";
             }
             //银行卡类型
-            if(!string.IsNullOrEmpty(BankCardTypeSelect))
+            if (!string.IsNullOrEmpty(BankCardTypeSelect))
             {
                 condition += " and BankCardType=" + BankCardTypeSelect;
             }
             //商户创客类型
-            if(!string.IsNullOrEmpty(MerBuddyTypeSelect))
+            if (!string.IsNullOrEmpty(MerBuddyTypeSelect))
             {
                 condition += " and MerBuddyType=" + MerBuddyTypeSelect;
             }
-            if(!string.IsNullOrEmpty(CreateDateData))
+            // if(!string.IsNullOrEmpty(CreateDateData))
+            // {
+            //     string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+            //     string start = datelist[0];
+            //     string end = datelist[1];
+            //     condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            // }
+            if (!string.IsNullOrEmpty(CreateDateData))
             {
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                string start = datelist[0];
-                string end = datelist[1];
-                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+                // string start = datelist[0];
+                // string end = datelist[1];
+                // condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+                var start = Convert.ToDateTime(Convert.ToDateTime(datelist[0]).ToString("yyyy-MM-dd"));
+                var end = Convert.ToDateTime(Convert.ToDateTime(datelist[1]).ToString("yyyy-MM-dd") + " 23:59:59");
+                var check = db.TradeRecord.Any(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId));
+                var checks = db.TradeRecord.Any(m => m.CreateDate <= end && m.BrandId == Convert.ToInt32(BrandId));
+                if (check)
+                {
+                    var sId = db.TradeRecord.Where(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId)).Min(m => m.Id);
+                    condition += "  and Id >=" + sId;
+                }
+                if (checks)
+                {
+                    var eId = db.TradeRecord.Where(m => m.CreateDate <= end && m.BrandId == Convert.ToInt32(BrandId)).Max(m => m.Id);
+                    condition += " and Id <=" + eId;
+                }
+            }
+            else
+            {
+                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"));
+                var check = db.TradeRecord.Any(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId));
+                if (check)
+                {
+                    var minId = db.TradeRecord.Where(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId)).Min(m => m.Id);
+                    var Info = function.ReadInstance("/WritePage/TradeRecord/TradeRecord" + BrandId + ".txt");
+                    if (string.IsNullOrEmpty(Info))
+                    {
+                        function.WritePage("/WritePage/TradeRecord/", "TradeRecord" + BrandId + "..txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
+                    else
+                    {
+                        condition += " and Id >=" + Convert.ToInt32(Info);
+                    }
+                }
+                else
+                {
+                    condition += " and Id =0";
+                }
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("TradeRecord", Fields, "Id desc", "0", page, limit, condition);
@@ -137,7 +173,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MerHelpFlag"] = dic["MerHelpFlag"].ToString() == "1" ? "是" : "否";
                 dic["CapFlag"] = dic["CapFlag"].ToString() == "1" ? "封顶" : "非封顶";
                 dic["QrPayFlag"] = dic["QrPayFlag"].ToString() == "1" ? "云闪付" : "非云闪付";
-                dic["DirectFlag"] = dic["DirectFlag"].ToString() == "1" ? "直营" : "非直营";                
+                dic["DirectFlag"] = dic["DirectFlag"].ToString() == "1" ? "直营" : "非直营";
                 //直属创客
                 int UserId = int.Parse(dic["UserId"].ToString());
                 Users puser = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
@@ -160,27 +196,23 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MerchantName"] = merchant.Name;
                 //商户创客类型
                 int MerBuddyType = int.Parse(dic["MerBuddyType"].ToString());
-                if(MerBuddyType == 0) dic["MerBuddyType"] = "非商户型创客";
-                if(MerBuddyType == 1) dic["MerBuddyType"] = "商户型创客";
+                if (MerBuddyType == 0) dic["MerBuddyType"] = "非商户型创客";
+                if (MerBuddyType == 1) dic["MerBuddyType"] = "商户型创客";
                 //银行卡类型
                 int BankCardType = int.Parse(dic["BankCardType"].ToString());
-                if(BankCardType == 0) dic["BankCardType"] = "借记卡";
-                if(BankCardType == 1) dic["BankCardType"] = "贷记卡";
-                if(BankCardType == 2) dic["BankCardType"] = "准贷记卡";
+                if (BankCardType == 0) dic["BankCardType"] = "借记卡";
+                if (BankCardType == 1) dic["BankCardType"] = "贷记卡";
+                if (BankCardType == 2) dic["BankCardType"] = "准贷记卡";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            
+
             string TotalTrade0 = "0.00";//贷记卡交易总额
             string TotalTrade1 = "0.00";//借记卡交易总额
-            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmount) from TradeRecord where BankCardType=1" + condition);
+            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(if(BankCardType=1,TradeAmount,0)),SUM(if(BankCardType=0,TradeAmount,0)) FROM TradeRecord where 1=1" + condition);
             if (dt.Rows.Count > 0)
             {
                 TotalTrade0 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(TradeAmount) from TradeRecord where BankCardType=0" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                TotalTrade1 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+                TotalTrade1 = decimal.Parse(function.CheckNum(dt.Rows[0][1].ToString())).ToString("f2");
             }
             other.Add("TotalTrade0", TotalTrade0);
             other.Add("TotalTrade1", TotalTrade1);
@@ -432,12 +464,12 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and MerUserId in (select UserId from UserForRealName where RealName='" + MerRealName + "')";
             }
             //银行卡类型
-            if(!string.IsNullOrEmpty(BankCardTypeSelect))
+            if (!string.IsNullOrEmpty(BankCardTypeSelect))
             {
                 condition += " and BankCardType=" + BankCardTypeSelect;
             }
             //商户创客类型
-            if(!string.IsNullOrEmpty(MerBuddyTypeSelect))
+            if (!string.IsNullOrEmpty(MerBuddyTypeSelect))
             {
                 condition += " and MerBuddyType=" + MerBuddyTypeSelect;
             }
@@ -449,7 +481,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MerHelpFlag"] = dic["MerHelpFlag"].ToString() == "1" ? "是" : "否";
                 dic["CapFlag"] = dic["CapFlag"].ToString() == "1" ? "封顶" : "非封顶";
                 dic["QrPayFlag"] = dic["QrPayFlag"].ToString() == "1" ? "云闪付" : "非云闪付";
-                dic["DirectFlag"] = dic["DirectFlag"].ToString() == "1" ? "直营" : "非直营";                
+                dic["DirectFlag"] = dic["DirectFlag"].ToString() == "1" ? "直营" : "非直营";
                 //直属创客
                 int UserId = int.Parse(dic["UserId"].ToString());
                 Users puser = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
@@ -472,12 +504,12 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MerchantName"] = merchant.Name;
                 //商户创客类型
                 int MerBuddyType = int.Parse(dic["MerBuddyType"].ToString());
-                if(MerBuddyType == 0) dic["MerBuddyType"] = "非商户型创客";
-                if(MerBuddyType == 1) dic["MerBuddyType"] = "商户型创客";
+                if (MerBuddyType == 0) dic["MerBuddyType"] = "非商户型创客";
+                if (MerBuddyType == 1) dic["MerBuddyType"] = "商户型创客";
                 //银行卡类型
                 int BankCardType = int.Parse(dic["BankCardType"].ToString());
-                if(BankCardType == 0) dic["BankCardType"] = "贷记卡";
-                if(BankCardType == 1) dic["BankCardType"] = "借记卡";
+                if (BankCardType == 0) dic["BankCardType"] = "贷记卡";
+                if (BankCardType == 1) dic["BankCardType"] = "借记卡";
                 dic.Remove("UserId");
                 dic.Remove("TopUserId");
                 dic.Remove("MerUserId");

Areas/Admin/Controllers/MainServer/UserAccountController.cs

@@ -55,13 +55,23 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客账户列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(UserAccount data, string CreateDate, string MakerCode, string RealName, int TopUserId, string AccountStatusSelect, string CreateDateData, int? sTotalAmount, int? eTotalAmount, int UserId = 0, int page = 1, int limit = 30)
+        public JsonResult IndexData(UserAccount data, string CreateDate, string MakerCode, string RealName, int TopUserId, string AccountStatusSelect, string CreateDateData, int? sTotalAmount, int? eTotalAmount, int UserId = 0, int ShowFlag = 0, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("CreateDate", "3"); //创建时间
             Fields.Add("sTotalAmount", "31"); //账户总金额
             Fields.Add("eTotalAmount", "32"); //账户总金额
+            if (ShowFlag == 0)
+            {
+                Dictionary<string, object> objs = new Dictionary<string, object>();
+                Dictionary<string, object> others = new Dictionary<string, object>();
+                others.Add("TotalAmount", 0);
+                others.Add("FreezeAmount", 0);
+                others.Add("BalanceAmount", 0);
+                objs.Add("other", others);
+                return Json(objs);
+            }
 
             string condition = " and Status>-1";
             //创客编号
@@ -75,16 +85,16 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and Id in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //账户状态
-            if(!string.IsNullOrEmpty(AccountStatusSelect))
+            if (!string.IsNullOrEmpty(AccountStatusSelect))
             {
                 condition += " and AccountStatus=" + AccountStatusSelect;
             }
             //顶级创客
-            if(TopUserId > 0)
+            if (TopUserId > 0)
             {
                 condition += " and Id in (select Id from Users where ParentNav like '," + TopUserId + ",%')";
             }
-            if(UserId > 0)
+            if (UserId > 0)
             {
                 condition += " and Id=" + UserId;
             }
@@ -98,7 +108,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MakerCode"] = user.MakerCode;
                 dic["RealName"] = user.RealName;
                 if (!string.IsNullOrEmpty(user.ParentNav))
-                { 
+                {
                     int TopId = int.Parse(user.ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
                     Users tuser = db.Users.FirstOrDefault(m => m.Id == TopId) ?? new Users();
                     dic["TopMakerCode"] = tuser.MakerCode;
@@ -107,24 +117,24 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["AccountStatusName"] = dic["AccountStatus"].ToString() == "0" ? "有效" : "冻结";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            if(!string.IsNullOrEmpty(CreateDateData))
+            if (!string.IsNullOrEmpty(CreateDateData))
             {
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
                 string start = datelist[0];
                 string end = datelist[1];
                 condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
-            if(sTotalAmount != null)
+            if (sTotalAmount != null)
             {
                 condition += " and BalanceAmount>=" + sTotalAmount.Value;
             }
-            if(eTotalAmount != null)
+            if (eTotalAmount != null)
             {
                 condition += " and BalanceAmount<=" + eTotalAmount.Value;
             }
             string TotalAmount = "0.00", FreezeAmount = "0.00", BalanceAmount = "0.00";
             DataTable dt = OtherMySqlConn.dtable("select sum(TotalAmount),sum(FreezeAmount),sum(BalanceAmount) from UserAccount where 1=1" + condition);
-            if(dt.Rows.Count > 0)
+            if (dt.Rows.Count > 0)
             {
                 TotalAmount = dt.Rows[0][0].ToString();
                 FreezeAmount = dt.Rows[0][1].ToString();

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -65,7 +65,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("ProductType", "1"); //产品类型
             Fields.Add("TransRecordNo", "3"); //交易流水编号
 
-            string condition = " and Status>-1";
+            string condition = condition = " and Status>-1";
             //创客编号
             if (!string.IsNullOrEmpty(MakerCode))
             {
@@ -77,31 +77,69 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //顶级创客
-            if(TopUserId > 0)
+            if (TopUserId > 0)
             {
                 condition += " and UserId in (select Id from Users where ParentNav like '," + TopUserId + ",%')";
             }
-            if(UserId > 0)
+            if (UserId > 0)
             {
                 condition += " and UserId=" + UserId;
             }
-            if(!string.IsNullOrEmpty(CreateDateData))
+            if (!string.IsNullOrEmpty(CreateDateData))
             {
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                string start = datelist[0];
-                string end = datelist[1];
-                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+                // string start = datelist[0];
+                // string end = datelist[1];
+                // condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+                var start = Convert.ToDateTime(Convert.ToDateTime(datelist[0]).ToString("yyyy-MM-dd"));
+                var end = Convert.ToDateTime(Convert.ToDateTime(datelist[1]).ToString("yyyy-MM-dd") + " 23:59:59");
+                var check = db.UserAccountRecord.Any(m => m.CreateDate >= start);
+                var checks = db.UserAccountRecord.Any(m => m.CreateDate <= end);
+                if (check)
+                {
+                    var sId = db.UserAccountRecord.Where(m => m.CreateDate >= start).Min(m => m.Id);
+                    condition += "  and Id >=" + sId;
+                }
+                if (checks)
+                {
+                    var eId = db.UserAccountRecord.Where(m => m.CreateDate <= end).Max(m => m.Id);
+                    condition += " and Id <=" + eId;
+                }
+            }
+            else
+            {
+                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"));
+                var check = db.UserAccountRecord.Any(m => m.CreateDate >= start);
+                if (check)
+                {
+                    var minId = db.UserAccountRecord.Where(m => m.CreateDate >= start).Min(m => m.Id);
+                    var Info = function.ReadInstance("/WritePage/UsersAccountRecord/UsersAccountRecord.txt");
+                    if (string.IsNullOrEmpty(Info.ToString()))
+                    {
+                        function.WritePage("/WritePage/UsersAccountRecord/", "UsersAccountRecord.txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
+                    else
+                    {
+                        condition += " and Id >=" + Convert.ToInt32(Info);
+                    }
+                }
+                else
+                {
+                    condition += " and Id =0";
+                }
+                
             }
             if (data.ChangeType > 0)
-            { 
+            {
                 condition += " and ChangeType=" + data.ChangeType;
             }
             if (data.ProductType > 0)
-            { 
+            {
                 condition += " and ProductType=" + data.ProductType;
             }
             if (!string.IsNullOrEmpty(data.TransRecordNo))
-            { 
+            {
                 condition += " and TransRecordNo='" + data.TransRecordNo + "'";
             }
 
@@ -114,7 +152,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MakerCode"] = user.MakerCode;
                 dic["RealName"] = user.RealName;
                 if (!string.IsNullOrEmpty(user.ParentNav))
-                { 
+                {
                     int TopId = int.Parse(user.ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
                     Users tuser = db.Users.FirstOrDefault(m => m.Id == TopId) ?? new Users();
                     dic["TopMakerCode"] = tuser.MakerCode;
@@ -124,18 +162,18 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["ProductTypeName"] = RelationClass.GetKqProductBrandInfo(ProductType);
                 int ChangeType = int.Parse(dic["ChangeType"].ToString());
                 dic["ChangeTypeName"] = RelationClassForConst.GetChangeTypeInfo(ChangeType);
-                
+
                 //获得盟主5元奖励的机具Sn
                 int SnId = int.Parse(dic["QueryCount"].ToString());
                 PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == SnId) ?? new PosMachinesTwo();
                 dic["PosSn"] = pos.PosSn;
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            
+
             string ChangeTypeAmount0 = "0.00", ChangeTypeAmount1 = "0.00", ChangeTypeAmount2 = "0.00", ChangeTypeAmount3 = "0.00", ChangeTypeAmount4 = "0.00", ChangeTypeAmount5 = "0.00", ChangeTypeAmount6 = "0.00", ChangeTypeAmount61 = "0.00", ChangeTypeAmount62 = "0.00", ChangeTypeAmount63 = "0.00", ChangeTypeAmount64 = "0.00", ChangeTypeAmount50 = "0.00", ChangeTypeAmount111 = "0.00", ChangeTypeAmount112 = "0.00", ChangeTypeAmount60 = "0.00", ChangeTypeAmount31 = "0.00";
             DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)),sum(if(ChangeType=1, ChangeAmount, 0)),sum(if(ChangeType=2, ChangeAmount, 0)),sum(if(ChangeType=6, ChangeAmount, 0)),sum(if(ChangeType=61, ChangeAmount, 0)),sum(if(ChangeType=62, ChangeAmount, 0)),sum(if(ChangeType=63, ChangeAmount, 0)),sum(if(ChangeType=64, ChangeAmount, 0)),sum(if(ChangeType=50, ChangeAmount, 0)),sum(if(ChangeType=111, ChangeAmount, 0)),sum(if(ChangeType=112, ChangeAmount, 0)),sum(if(ChangeType=60, ChangeAmount, 0)),sum(if(ChangeType=31, ChangeAmount, 0)),sum(if(ChangeType=3, ChangeAmount, 0)),sum(if(ChangeType=4, ChangeAmount, 0)),sum(if(ChangeType=5, ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
             DataTable dts = OtherMySqlConn.dtable("select SUM(FluxProfitAmt) from FluxProfitDetail where ");
-            if(dt.Rows.Count > 0)
+            if (dt.Rows.Count > 0)
             {
                 ChangeTypeAmount0 = dt.Rows[0][0].ToString();
                 ChangeTypeAmount1 = dt.Rows[0][1].ToString();
@@ -394,11 +432,11 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //顶级创客
-            if(TopUserId > 0)
+            if (TopUserId > 0)
             {
                 condition += " and UserId in (select Id from Users where ParentNav like '," + TopUserId + ",%')";
             }
-            if(UserId > 0)
+            if (UserId > 0)
             {
                 condition += " and UserId=" + UserId;
             }
@@ -412,7 +450,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MakerCode"] = user.MakerCode;
                 dic["RealName"] = user.RealName;
                 if (!string.IsNullOrEmpty(user.ParentNav))
-                { 
+                {
                     int TopId = int.Parse(user.ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
                     Users tuser = db.Users.FirstOrDefault(m => m.Id == TopId) ?? new Users();
                     dic["TopMakerCode"] = tuser.MakerCode;

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -99,12 +99,50 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and QueryCount=" + QueryCountSelect;
             }
+            
             if (!string.IsNullOrEmpty(CreateDateData))
             {
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                string start = datelist[0];
-                string end = datelist[1];
-                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+                // string start = datelist[0];
+                // string end = datelist[1];
+                // condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+                var start = Convert.ToDateTime(Convert.ToDateTime(datelist[0]).ToString("yyyy-MM-dd"));
+                var end = Convert.ToDateTime(Convert.ToDateTime(datelist[1]).ToString("yyyy-MM-dd") + " 23:59:59");
+                var check = db.UserCashRecord.Any(m => m.CreateDate >= start && m.TradeType == 3);
+                var checks = db.UserCashRecord.Any(m => m.CreateDate <= end && m.TradeType == 3);
+                if (check)
+                {
+                    var sId = db.UserCashRecord.Where(m => m.CreateDate >= start && m.TradeType == 3).Min(m => m.Id);
+                    condition += "  and Id >=" + sId;
+                }
+                if (checks)
+                {
+                    var eId = db.UserCashRecord.Where(m => m.CreateDate <= end && m.TradeType == 3).Max(m => m.Id);
+                    condition += " and Id <=" + eId;
+                }
+            }
+            else
+            {
+                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"));
+                var check = db.UserCashRecord.Any(m => m.CreateDate >= start && m.TradeType == 3);
+                if (check)
+                {
+                    var minId = db.UserCashRecord.Where(m => m.CreateDate >= start && m.TradeType == 3).Min(m => m.Id);
+                    var Info = function.ReadInstance("/WritePage/UserCashRecord/UserCashRecord.txt");
+                    if (string.IsNullOrEmpty(Info.ToString()))
+                    {
+                        function.WritePage("/WritePage/UserCashRecord/", "UserCashRecord.txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
+                    else
+                    {
+                        condition += " and Id >=" + Convert.ToInt32(Info);
+                    }
+                }
+                else
+                {
+                    condition += " and Id =0";
+                }
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserCashRecord", Fields, "Id desc", "0", page, limit, condition);
@@ -130,21 +168,23 @@ namespace MySystem.Areas.Admin.Controllers
             string WaitAmount = "0.00";//待处理总金额
             string SuccessAmount = "0.00";//提现成功总金额
             string FailAmount = "0.00";//提现失败总金额
-            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=0" + condition);
+            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(if(Status=0,TradeAmount,0)),SUM(if(Status=1,TradeAmount,0)),SUM(if(Status=2,TradeAmount,0)) FROM UserCashRecord where 1=1 " + condition);
             if (dt.Rows.Count > 0)
             {
                 WaitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+                SuccessAmount = decimal.Parse(function.CheckNum(dt.Rows[0][1].ToString())).ToString("f2");
+                FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][2].ToString())).ToString("f2");
             }
-            dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=1" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                SuccessAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=2" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
+            // dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=1" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     SuccessAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
+            // dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=2" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            // }
             other.Add("WaitAmount", WaitAmount);
             other.Add("SuccessAmount", SuccessAmount);
             other.Add("FailAmount", FailAmount);
@@ -462,7 +502,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
 
-        
+
         #region 盟主提现记录列表
 
         /// <summary>
@@ -535,9 +575,50 @@ namespace MySystem.Areas.Admin.Controllers
             if (!string.IsNullOrEmpty(CreateDateData))
             {
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                string start = datelist[0];
-                string end = datelist[1];
-                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+                // string start = datelist[0];
+                // string end = datelist[1];
+                // condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+                var start = Convert.ToDateTime(Convert.ToDateTime(datelist[0]).ToString("yyyy-MM-dd"));
+                var end = Convert.ToDateTime(Convert.ToDateTime(datelist[1]).ToString("yyyy-MM-dd") + " 23:59:59");
+                var check = db.UserCashRecord.Any(m => m.CreateDate >= start && m.TradeType == 3);
+                var checks = db.UserCashRecord.Any(m => m.CreateDate <= end && m.TradeType == 3);
+                if (check)
+                {
+                    var sId = db.UserCashRecord.Where(m => m.CreateDate >= start && m.TradeType == 3).Min(m => m.Id);
+                    condition += "  and Id >=" + sId;
+                }
+                if (checks)
+                {
+                    var eId = db.UserCashRecord.Where(m => m.CreateDate <= end && m.TradeType == 3).Max(m => m.Id);
+                    condition += " and Id <=" + eId;
+                }
+            }
+            else
+            {
+                // var start = DateTime.Now.ToString("yyyy-MM") + "-01";
+                // var end = Convert.ToDateTime(start).AddMonths(1);
+                // condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<'" + end + " 00:00:00'";
+
+                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd"));
+                var check = db.UserCashRecord.Any(m => m.CreateDate >= start && m.TradeType == 3);
+                if (check)
+                {
+                    var minId = db.UserCashRecord.Where(m => m.CreateDate >= start && m.TradeType == 3).Min(m => m.Id);
+                    var Info = function.ReadInstance("/WritePage/UserCashRecord/LeaderUserCashRecord.txt");
+                    if (string.IsNullOrEmpty(Info.ToString()))
+                    {
+                        function.WritePage("/WritePage/UserCashRecord/", "LeaderUserCashRecord.txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
+                    else
+                    {
+                        condition += " and Id >=" + Convert.ToInt32(Info);
+                    }
+                }
+                else
+                {
+                    condition += " and Id =0";
+                }
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserCashRecord", Fields, "Id desc", "0", page, limit, condition);
@@ -563,20 +644,12 @@ namespace MySystem.Areas.Admin.Controllers
             string WaitAmount = "0.00";//待处理总金额
             string SuccessAmount = "0.00";//提现成功总金额
             string FailAmount = "0.00";//提现失败总金额
-            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=0" + condition);
+            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(if(Status=0,TradeAmount,0)),SUM(if(Status=1,TradeAmount,0)),SUM(if(Status=2,TradeAmount,0)) FROM UserCashRecord where 1=1 " + condition);
             if (dt.Rows.Count > 0)
             {
                 WaitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=1" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                SuccessAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=2" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+                SuccessAmount = decimal.Parse(function.CheckNum(dt.Rows[0][1].ToString())).ToString("f2");
+                FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][2].ToString())).ToString("f2");
             }
             other.Add("WaitAmount", WaitAmount);
             other.Add("SuccessAmount", SuccessAmount);
@@ -586,7 +659,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         #endregion
-        
+
         #region 导出盟主Excel
 
         /// <summary>
@@ -778,20 +851,12 @@ namespace MySystem.Areas.Admin.Controllers
             string WaitAmount = "0.00";//待处理总金额
             string SuccessAmount = "0.00";//提现成功总金额
             string FailAmount = "0.00";//提现失败总金额
-            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=0" + condition);
+            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(if(Status=0,TradeAmount,0)),SUM(if(Status=1,TradeAmount,0)),SUM(if(Status=2,TradeAmount,0)) FROM UserCashRecord where 1=1 " + condition);
             if (dt.Rows.Count > 0)
             {
                 WaitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=1" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                SuccessAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=2" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+                SuccessAmount = decimal.Parse(function.CheckNum(dt.Rows[0][1].ToString())).ToString("f2");
+                FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][2].ToString())).ToString("f2");
             }
             other.Add("WaitAmount", WaitAmount);
             other.Add("SuccessAmount", SuccessAmount);
@@ -801,7 +866,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         #endregion
-        
+
         #region 导出助利宝Excel
 
         /// <summary>

Areas/Admin/Controllers/MainServer/UserTradeDaySummaryController.cs

@@ -52,7 +52,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客交易日汇总列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(TradeDaySummary data, string MakerCode, string RealName, string TradeMonthSelect, string TradeDateSelect,string BrandId, int page = 1, int limit = 30)
+        public JsonResult IndexData(TradeDaySummary data, string MakerCode, string RealName, string TradeMonthSelect, string TradeDateSelect, string BrandId, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -73,20 +73,66 @@ namespace MySystem.Areas.Admin.Controllers
             // //产品类型
             if (!string.IsNullOrEmpty(BrandId))
             {
-                condition += " and BrandId ='" + BrandId +"'";
+                condition += " and BrandId ='" + BrandId + "'";
             }
             //交易月份
             if (!string.IsNullOrEmpty(TradeMonthSelect))
             {
                 condition += " and TradeMonth=" + TradeMonthSelect.Replace("-", "");
             }
+            else
+            {
+                var start = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
+                condition += " and TradeMonth>=" + start;
+            }
             //交易日期
             if (!string.IsNullOrEmpty(TradeDateSelect))
             {
                 string[] datelist = TradeDateSelect.Split(new string[] { " - " }, StringSplitOptions.None);
                 string start = datelist[0].Replace("-", "");
                 string end = datelist[1].Replace("-", "");
-                condition += " and TradeDate>='" + start + "' and TradeDate<='" + end + "' ";
+                condition += " and TradeDate>=" + start + " and TradeDate<=" + end + "";
+
+                // var start = Convert.ToDateTime(datelist[0]).ToString("yyyyMMdd");
+                // var end = Convert.ToDateTime(datelist[1]).ToString("yyyyMMdd");
+                // var check = db.TradeDaySummary.Any(m => Convert.ToInt32(m.TradeDate) >= Convert.ToInt32(start));
+                // var checks = db.TradeDaySummary.Any(m => Convert.ToInt32(m.TradeDate) <= Convert.ToInt32(end));
+                // if (check)
+                // {
+                //     var sId = db.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) >= Convert.ToInt32(start)).Min(m => m.Id);
+                //     condition += "  and Id >=" + sId;
+                // }
+                // if (checks)
+                // {
+                //     var eId = db.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) <= Convert.ToInt32(end)).Max(m => m.Id);
+                //     condition += " and Id <=" + eId;
+                // }
+            }
+            else
+            {
+                var start = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
+                condition += " and TradeMonth>=" + start;
+
+                // var start = DateTime.Now.AddMonths(-1).ToString("yyyyMMdd");
+                // var check = db.TradeDaySummary.Any(m => Convert.ToInt32(m.TradeDate) >= Convert.ToInt32(start));
+                // if (check)
+                // {
+                //     var minId = db.TradeDaySummary.Where(m => Convert.ToInt32(m.TradeDate) >= Convert.ToInt32(start)).Min(m => m.Id);
+                //     var Info = Convert.ToInt32(function.ReadInstance("/WritePage/UserTradeDaySummary/UserTradeDaySummary.txt"));
+                //     if (string.IsNullOrEmpty(Info.ToString()))
+                //     {
+                //         function.WritePage("/WritePage/UserTradeDaySummary/", "UserTradeDaySummary.txt", minId.ToString());
+                //         condition += " and Id >=" + minId;
+                //     }
+                //     else
+                //     {
+                //         condition += " and Id >=" + Info;
+                //     }
+                // }
+                // else
+                // {
+                //     condition += " and Id =0";
+                // }
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("TradeDaySummary", Fields, "Id desc", "0", page, limit, condition);
@@ -110,7 +156,7 @@ namespace MySystem.Areas.Admin.Controllers
             string NotHelpNonDirectDebitTradeAmt = "0.00"; //稳定期非直营借记卡交易
 
             DataTable dt = OtherMySqlConn.dtable("select sum(HelpDirectTradeAmt),sum(NotHelpDirectTradeAmt),sum(HelpDirectDebitTradeAmt),sum(NotHelpDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='self' " + condition);
-            if(dt.Rows.Count > 0)
+            if (dt.Rows.Count > 0)
             {
                 HelpDirectTradeAmt = dt.Rows[0][0].ToString();
                 NotHelpDirectTradeAmt = dt.Rows[0][1].ToString();
@@ -118,7 +164,7 @@ namespace MySystem.Areas.Admin.Controllers
                 NotHelpDirectDebitTradeAmt = dt.Rows[0][3].ToString();
             }
             dt = OtherMySqlConn.dtable("select sum(HelpNonDirectTradeAmt),sum(NotHelpNonDirectTradeAmt),sum(HelpNonDirectDebitTradeAmt),sum(NotHelpNonDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='team' " + condition);
-            if(dt.Rows.Count > 0)
+            if (dt.Rows.Count > 0)
             {
                 HelpNonDirectTradeAmt = dt.Rows[0][0].ToString();
                 NotHelpNonDirectTradeAmt = dt.Rows[0][1].ToString();

Areas/Admin/Controllers/MainServer/UserTradeMonthSummaryController.cs

@@ -38,7 +38,7 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            
+
             List<KqProducts> Brands = db.KqProducts.OrderBy(m => m.Id).ToList();
             ViewBag.Brands = Brands;
 
@@ -72,16 +72,61 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //交易统计类型
-            if(!string.IsNullOrEmpty(StatTypeSelect))
+            if (!string.IsNullOrEmpty(StatTypeSelect))
             {
                 condition += " and StatType=" + StatTypeSelect;
             }
             //交易所在月
+            // if (!string.IsNullOrEmpty(CreateDateData))
+            // {
+            //     string[] months = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+            //     DateTime end = DateTime.Parse(months[0] + "-01 00:00:00").AddMonths(1);
+            //     condition += " and CreateDate>='" + months[0] + "-01 00:00:00' and CreateDate<'" + end.ToString("yyyy-MM-dd HH:mm:ss") + "'";
+            // }
             if (!string.IsNullOrEmpty(CreateDateData))
             {
-                string[] months = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                DateTime end = DateTime.Parse(months[0] + "-01 00:00:00").AddMonths(1);
-                condition += " and CreateDate>='" + months[0] + "-01 00:00:00' and CreateDate<'" + end.ToString("yyyy-MM-dd HH:mm:ss") + "'";
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                var start = Convert.ToDateTime(datelist[0]).ToString("yyyyMM");
+                var end = Convert.ToDateTime(datelist[1]).ToString("yyyyMM");
+                condition += " and TradeMonth>=" + Convert.ToInt32(start) + " and TradeMonth<=" + Convert.ToInt32(end) + " ";
+
+                // var check = db.UserTradeMonthSummary.Any(m => Convert.ToInt32(m.SeoKeyword) >= Convert.ToInt32(start));
+                // var checks = db.UserTradeMonthSummary.Any(m => Convert.ToInt32(m.SeoKeyword) <= Convert.ToInt32(end));
+                // if (check)
+                // {
+                //     var sId = db.UserTradeMonthSummary.Where(m => Convert.ToInt32(m.SeoKeyword) >= Convert.ToInt32(start)).Min(m => m.Id);
+                //     condition += "  and Id >=" + sId;
+                // }
+                // if (checks)
+                // {
+                //     var eId = db.UserTradeMonthSummary.Where(m => Convert.ToInt32(m.SeoKeyword) <= Convert.ToInt32(end)).Max(m => m.Id);
+                //     condition += " and Id <=" + eId;
+                // }
+            }
+            else
+            {
+                var start = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
+                condition += " and TradeMonth >=" + Convert.ToInt32(start);
+                
+                // var check = db.UserTradeMonthSummary.Any(m => Convert.ToInt32(m.TradeMonth) >= Convert.ToInt32(start));
+                // if (check)
+                // {
+                //     var minId = db.UserTradeMonthSummary.Where(m => Convert.ToInt32(m.TradeMonth) >= Convert.ToInt32(start)).Min(m => m.Id);
+                //     var Info = Convert.ToInt32(function.ReadInstance("/WritePage/UserTradeMonthSummary/UserTradeMonthSummary.txt"));
+                //     if (string.IsNullOrEmpty(Info.ToString()))
+                //     {
+                //         function.WritePage("/WritePage/UserTradeMonthSummary/", "UserTradeMonthSummary.txt", minId.ToString());
+                //         condition += " and Id >=" + minId;
+                //     }
+                //     else
+                //     {
+                //         condition += " and Id >=" + Info;
+                //     }
+                // }
+                // else
+                // {
+                //     condition += " and Id =0";
+                // }
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserTradeMonthSummary", Fields, "Id desc", "0", page, limit, condition);
@@ -94,8 +139,8 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MakerCode"] = user.MakerCode;
                 dic["RealName"] = user.RealName;
                 int StatType = int.Parse(dic["StatType"].ToString());
-                if(StatType == 0) dic["StatType"] = "直营商户交易统计";
-                if(StatType == 1) dic["StatType"] = "团队交易统计";
+                if (StatType == 0) dic["StatType"] = "直营商户交易统计";
+                if (StatType == 1) dic["StatType"] = "团队交易统计";
             }
             return Json(obj);
         }
@@ -320,7 +365,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //交易统计类型
-            if(!string.IsNullOrEmpty(StatTypeSelect))
+            if (!string.IsNullOrEmpty(StatTypeSelect))
             {
                 condition += " and StatType=" + StatTypeSelect;
             }
@@ -342,8 +387,8 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MakerCode"] = user.MakerCode;
                 dic["RealName"] = user.RealName;
                 int StatType = int.Parse(dic["StatType"].ToString());
-                if(StatType == 0) dic["StatType"] = "直营商户交易统计";
-                if(StatType == 1) dic["StatType"] = "团队交易统计";
+                if (StatType == 0) dic["StatType"] = "直营商户交易统计";
+                if (StatType == 1) dic["StatType"] = "团队交易统计";
                 dic.Remove("UserId");
             }
 

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -58,7 +58,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(Users data, string ParentMakerCode, string ParentRealName, string AuthFlagSelect, string CreateDateData, int TopUserId, string RiskFlagSelect, string MerchantTypeSelect, int? sSettleAmount, int? eSettleAmount, int? sCashFreezeAmt, int? eCashFreezeAmt, int UserId, int SelfId = 0, int ParentId = 0, int page = 1, int limit = 30)
+        public JsonResult IndexData(Users data, string ParentMakerCode, string ParentRealName, string AuthFlagSelect, string CreateDateData, int TopUserId, string RiskFlagSelect, string MerchantTypeSelect, int? sSettleAmount, int? eSettleAmount, int? sCashFreezeAmt, int? eCashFreezeAmt, int UserId, int SelfId = 0, int ParentId = 0, int ShowFlag = 0, int page = 1, int limit = 30)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("MakerCode", "1"); //创客编号
@@ -68,6 +68,11 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SettleAmount", "3"); //结算金额
             Fields.Add("CashFreezeAmt", "3"); //冻结金额
             Fields.Add("UserLevel", "0"); //创客等级
+            if (ShowFlag == 0)
+            {
+                Dictionary<string, object> objs = new Dictionary<string, object>();
+                return Json(objs);
+            }
 
             string condition = " and Status>-1";
             string sort = "Id desc";
@@ -1489,6 +1494,7 @@ namespace MySystem.Areas.Admin.Controllers
         public JsonResult ChildrenData(Users data, int BrandSelect, string MakerCode, string CreateDateData, int ParentId = 0, int page = 1, int limit = 30)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
+            WebCMSEntities db = new WebCMSEntities();
             Fields.Add("MakerCode", "1"); //创客编号
 
             int BrandId = BrandSelect;
@@ -1508,6 +1514,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ParentUserId=" + ParentId + " or Id=" + ParentId;
             }
+            //时间不为空
             if (!string.IsNullOrEmpty(CreateDateData))
             {
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
@@ -1515,6 +1522,15 @@ namespace MySystem.Areas.Admin.Controllers
                 end = datelist[1].Replace("-", "");
                 con += " and TradeDate>='" + start + "' and TradeDate<='" + end + "'";
                 cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') >=" + start + " and DATE_FORMAT(BindingTime,'%Y%m%d') <=" + end;
+
+            }
+            //时间为空
+            else
+            {
+                start = DateTime.Now.ToString("yyyyMM") + "01";
+                end = DateTime.Now.AddMonths(1).ToString("yyyyMM") + "01";
+                con += " and TradeDate>='" + start + "' and TradeDate<'" + end + "'";
+                cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') >=" + start + " and DATE_FORMAT(BindingTime,'%Y%m%d') <" + end;
             }
             if (!string.IsNullOrEmpty(BrandSelect.ToString()) && BrandId > 0)
             {
@@ -1588,153 +1604,46 @@ namespace MySystem.Areas.Admin.Controllers
             int TBCount = 0;
             int TACount = 0;
 
-            WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> other = new Dictionary<string, object>();
-            DataTable dt = OtherMySqlConn.dtable("select Sum(HelpDirectTradeAmt + HelpDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='self' and UserId= '" + ParentId + "'" + con);
+            DataTable dt = OtherMySqlConn.dtable("SELECT Sum(HelpDirectTradeAmt + HelpDirectDebitTradeAmt),Sum(if (QueryCount = 0,HelpDirectTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitTradeAmt - HelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitCapNum,0)),Sum(if (QueryCount = 1,HelpDirectTradeAmt,0)),Sum(NotHelpDirectTradeAmt + NotHelpDirectDebitTradeAmt),Sum(if (QueryCount = 0,NotHelpDirectTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitTradeAmt - NotHelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitCapNum,0)),Sum(if (QueryCount = 1,NotHelpDirectTradeAmt,0))from TradeDaySummary where SeoTitle = 'self' and UserId =" + ParentId + "" + con);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
-            if (dt.Rows.Count > 0)
-            {
-                DAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitTradeAmt),Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
-            if (dt.Rows.Count > 0)
-            {
-                JAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
-            if (dt.Rows.Count > 0)
-            {
-                JfAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
-            if (dt.Rows.Count > 0)
-            {
-                JCountfc = Convert.ToInt32(function.CheckInt(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
-            if (dt.Rows.Count > 0)
-            {
-                YAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectTradeAmt + NotHelpDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='self' and UserId= '" + ParentId + "'" + con);
-            if (dt.Rows.Count > 0)
-            {
-                TotalAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
-            if (dt.Rows.Count > 0)
-            {
-                DAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitTradeAmt),Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
-            if (dt.Rows.Count > 0)
-            {
-                JAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
-            if (dt.Rows.Count > 0)
-            {
-                JfAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
-            if (dt.Rows.Count > 0)
-            {
-                JCountwd = Convert.ToInt32(function.CheckInt(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='self' and UserId= '" + ParentId + "'" + con);
-            if (dt.Rows.Count > 0)
-            {
-                YAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-
-            //TODO: 统计激活绑定数(个人)
-            dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND BuyUserId= '" + ParentId + "'" + cons);
-            if (dt.Rows.Count > 0)
-            {
-                PBCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("SELECT SUM(DirectDebitCapNum) sum FROM UserTradeDaySummary WHERE SeoTitle='self' AND UserId= '" + ParentId + "'" + con);
+                DAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
+                JAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][2].ToString()));
+                JfAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][3].ToString()));
+                JCountfc = Convert.ToInt32(function.CheckInt(dt.Rows[0][4].ToString()));
+                YAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][5].ToString()));
+                TotalAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][6].ToString()));
+                DAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][7].ToString()));
+                JAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][8].ToString()));
+                JfAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][9].ToString()));
+                JCountwd = Convert.ToInt32(function.CheckInt(dt.Rows[0][10].ToString()));
+                YAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][11].ToString()));
+            }
+            //统计激活绑定数(个人、团队)
+            dt = OtherMySqlConn.dtable("SELECT SUM(if(SeoTitle='self',ActiveBuddyMerStatus,0)),SUM(if(SeoTitle='team',ActiveBuddyMerStatus,0)) FROM UserTradeMonthSummary WHERE UserId= " + ParentId + "" + cons);
             if (dt.Rows.Count > 0)
             {
                 PACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            //TODO: 统计激活绑定数(团队)
-            dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND BuyUserId IN (SELECT Id FROM Users WHERE ParentNav LIKE '%," + ParentId + ",%' OR Id=" + ParentId + ")" + cons);
-            if (dt.Rows.Count > 0)
-            {
-                TBCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("SELECT SUM(NonDirectDebitCapNum) sum FROM UserTradeDaySummary WHERE SeoTitle='team' AND UserId= '" + ParentId + "'" + con);
-            if (dt.Rows.Count > 0)
-            {
-                TACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
+                TACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][1].ToString()));
             }
 
-            DataTable dts = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='team' and UserId= '" + ParentId + "'" + con);
+            DataTable dts = OtherMySqlConn.dtable("SELECT Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,HelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitTradeAmt - HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,HelpNonDirectTradeAmt,0)),Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,NotHelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitTradeAmt - NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,NotHelpNonDirectTradeAmt,0))from TradeDaySummary where SeoTitle = 'team' and UserId =" + ParentId + "" + con);
             if (dts.Rows.Count > 0)
             {
                 TotalAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
-            }
-            dts = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
-            if (dt.Rows.Count > 0)
-            {
-                DAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
-            }
-            dts = OtherMySqlConn.dtable("select Sum(HelpNonDirectDebitTradeAmt),Sum(HelpNonDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
-            if (dt.Rows.Count > 0)
-            {
-                JAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dts.Rows[0][1].ToString()));
-            }
-            dts = OtherMySqlConn.dtable("select Sum(HelpNonDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
-            if (dts.Rows.Count > 0)
-            {
-                JfAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
-            }
-            dts = OtherMySqlConn.dtable("select Sum(HelpNoonDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
-            if (dts.Rows.Count > 0)
-            {
-                JCountfc1 = Convert.ToInt32(function.CheckInt(dts.Rows[0][0].ToString()));
-            }
-            dts = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
-            if (dts.Rows.Count > 0)
-            {
-                YAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
-            }
-
-            dts = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='team' and UserId= '" + ParentId + "'" + con);
-            if (dts.Rows.Count > 0)
-            {
-                TotalAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
-            }
-            dts = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
-            if (dts.Rows.Count > 0)
-            {
-                DAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
-            }
-            dts = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectDebitTradeAmt),Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
-            if (dts.Rows.Count > 0)
-            {
-                JAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dts.Rows[0][1].ToString()));
-            }
-            dts = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
-            if (dts.Rows.Count > 0)
-            {
-                JfAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
-            }
-            dts = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
-            if (dts.Rows.Count > 0)
-            {
-                JCountwd1 = Convert.ToInt32(function.CheckInt(dts.Rows[0][0].ToString()));
-            }
-            dts = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='team' and UserId= '" + ParentId + "'" + con);
-            if (dts.Rows.Count > 0)
-            {
-                YAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
+                DAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][1].ToString()));
+                JAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][2].ToString()));
+                JfAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][3].ToString()));
+                JCountfc1 = Convert.ToInt32(function.CheckInt(dts.Rows[0][4].ToString()));
+                YAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][5].ToString()));
+                TotalAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][6].ToString()));
+                DAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][7].ToString()));
+                JAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][8].ToString()));
+                JfAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][9].ToString()));
+                JCountwd1 = Convert.ToInt32(function.CheckInt(dts.Rows[0][10].ToString()));
+                YAmtwd1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][11].ToString()));
             }
 
             other.Add("TotalAmtfc", TotalAmtfc);
@@ -1777,6 +1686,8 @@ namespace MySystem.Areas.Admin.Controllers
 
         public Dictionary<string, object> GetMonthTradeForBrand(int UserId, string sTradeDate, string eTradeDate, int BrandId)
         {
+            WebCMSEntities db = new WebCMSEntities();
+
             string condition = " and Status>-1";
             string cons = " and Status>=-1";
             string con = " and Status>=-1";
@@ -1794,14 +1705,14 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId =" + UserId;
             }
             //开始时间
-            if (!string.IsNullOrEmpty(sTradeDate))
+            if (!string.IsNullOrEmpty(sTradeDate) && !string.IsNullOrEmpty(eTradeDate))
             {
-                condition += " and TradeDate >=" + Convert.ToInt32(sTradeDate);
-                cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') >=" + Convert.ToInt32(sTradeDate);
-                con += " and TradeDate >=" + Convert.ToInt32(sTradeDate);
+                condition += " and TradeDate >=" + Convert.ToInt32(sTradeDate) + " and TradeDate <=" + Convert.ToInt32(eTradeDate);
+                cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') >=" + Convert.ToInt32(sTradeDate) + " and DATE_FORMAT(BindingTime,'%Y%m%d') <=" + Convert.ToInt32(eTradeDate);
+                con += " and TradeDate >=" + Convert.ToInt32(sTradeDate) + " and TradeDate <=" + Convert.ToInt32(eTradeDate);
             }
             //结束时间
-            if (!string.IsNullOrEmpty(eTradeDate))
+            else
             {
                 condition += " and TradeDate <=" + Convert.ToInt32(eTradeDate);
                 cons += " and DATE_FORMAT(BindingTime,'%Y%m%d') <=" + Convert.ToInt32(eTradeDate);
@@ -1831,97 +1742,112 @@ namespace MySystem.Areas.Admin.Controllers
             int TBCount = 0;
             int TACount = 0;
 
-            WebCMSEntities db = new WebCMSEntities();
             Dictionary<string, object> obj = new Dictionary<string, object>();
-            DataTable dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='team'" + condition);
+            DataTable dt = OtherMySqlConn.dtable("SELECT Sum(HelpDirectTradeAmt + HelpDirectDebitTradeAmt),Sum(if (QueryCount = 0,HelpDirectTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitTradeAmt - HelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitCapNum,0)),Sum(if (QueryCount = 1,HelpDirectTradeAmt,0)),Sum(NotHelpDirectTradeAmt + NotHelpDirectDebitTradeAmt),Sum(if (QueryCount = 0,NotHelpDirectTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitTradeAmt - NotHelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitCapNum,0)),Sum(if (QueryCount = 1,NotHelpDirectTradeAmt,0))from TradeDaySummary where SeoTitle = 'team'" + condition);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                DAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectDebitTradeAmt),Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                JAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                JfAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                JCountfc = Convert.ToInt32(function.CheckInt(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='team'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                YAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='team'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                TotalAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                DAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectDebitTradeAmt),Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                JAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                JfAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                JCountwd = Convert.ToInt32(function.CheckInt(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='team'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                YAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("SELECT SUM(NonDirectDebitCapNum) sum FROM UserTradeDaySummary WHERE SeoTitle='team' AND UserId= '" + UserId + "'" + cons);
-            if (dt.Rows.Count > 0)
-            {
-                BCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("SELECT SUM(NonDirectDebitCapNum) sum FROM UserTradeDaySummary WHERE SeoTitle='team' AND UserId= '" + UserId + "'" + cons);
+                DAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
+                JAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][2].ToString()));
+                JfAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][3].ToString()));
+                JCountfc = Convert.ToInt32(function.CheckInt(dt.Rows[0][4].ToString()));
+                YAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][5].ToString()));
+                TotalAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][6].ToString()));
+                DAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][7].ToString()));
+                JAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][8].ToString()));
+                JfAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][9].ToString()));
+                JCountwd = Convert.ToInt32(function.CheckInt(dt.Rows[0][10].ToString()));
+                YAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][11].ToString()));
+            }
+            // DataTable dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='team'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
+            // }
+            // dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     DAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
+            // }
+            // dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectDebitTradeAmt),Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     JAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
+            // }
+            // dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     JfAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
+            // }
+            // dt = OtherMySqlConn.dtable("select Sum(HelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     JCountfc = Convert.ToInt32(function.CheckInt(dt.Rows[0][0].ToString()));
+            // }
+            // dt = OtherMySqlConn.dtable("select Sum(HelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='team'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     YAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
+            // }
+
+            // dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt) from TradeDaySummary where SeoTitle='team'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     TotalAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
+            // }
+            // dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     DAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
+            // }
+            // dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectDebitTradeAmt),Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     JAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString())) - Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
+            // }
+            // dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapTradeAmt) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     JfAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
+            // }
+            // dt = OtherMySqlConn.dtable("select Sum(NotHelpDirectDebitCapNum) from TradeDaySummary where QueryCount=0 and SeoTitle='team'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     JCountwd = Convert.ToInt32(function.CheckInt(dt.Rows[0][0].ToString()));
+            // }
+            // dt = OtherMySqlConn.dtable("select Sum(NotHelpNonDirectTradeAmt) from TradeDaySummary where QueryCount=1 and SeoTitle='team'" + condition);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     YAmtwd = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
+            // }
+            // dt = OtherMySqlConn.dtable("SELECT SUM(ActiveBuddyMerStatus) sum FROM UserTradeMonthSummary WHERE SeoTitle='team' AND UserId= '" + UserId + "'" + cons);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     BCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
+            // }
+            dt = OtherMySqlConn.dtable("SELECT SUM(ActiveBuddyMerStatus) sum FROM UserTradeMonthSummary WHERE SeoTitle='team' AND UserId= '" + UserId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 ACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
             }
             //TODO: 统计激活绑定数(个人)
-            dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND BuyUserId= '" + UserId + "'" + cons);
-            if (dt.Rows.Count > 0)
-            {
-                PBCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("SELECT SUM(DirectDebitCapNum) sum FROM UserTradeDaySummary WHERE SeoTitle='self' AND UserId= '" + UserId + "'" + con);
+            // dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND BuyUserId= '" + UserId + "'" + cons);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     PBCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
+            // }
+            dt = OtherMySqlConn.dtable("SELECT SUM(ActiveBuddyMerStatus) sum FROM UserTradeMonthSummary WHERE SeoTitle='self' AND UserId= '" + UserId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 PACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
             }
             //TODO: 统计激活绑定数(团队)
-            dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND BuyUserId IN (SELECT Id FROM Users WHERE ParentNav LIKE '%," + UserId + ",%' OR Id=" + UserId + ")" + cons);
-            if (dt.Rows.Count > 0)
-            {
-                TBCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
-            }
-            dt = OtherMySqlConn.dtable("SELECT SUM(NonDirectDebitCapNum) sum FROM UserTradeDaySummary WHERE SeoTitle='team' AND UserId= '" + UserId + "'" + con);
+            // dt = OtherMySqlConn.dtable("SELECT COUNT(0) count FROM PosMachinesTwo WHERE BindingState=1 AND BuyUserId IN (SELECT Id FROM Users WHERE ParentNav LIKE '%," + UserId + ",%' OR Id=" + UserId + ")" + cons);
+            // if (dt.Rows.Count > 0)
+            // {
+            //     TBCount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
+            // }
+            dt = OtherMySqlConn.dtable("SELECT SUM(ActiveBuddyMerStatus) sum FROM UserTradeMonthSummary WHERE SeoTitle='team' AND UserId= '" + UserId + "'" + con);
             if (dt.Rows.Count > 0)
             {
                 TACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));

Areas/Admin/Views/MainServer/ActiveReward/Index.cshtml

@@ -5,33 +5,40 @@
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>激活奖励记录</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 100px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
-        }        
-        .w100{
+        }
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
@@ -41,15 +48,13 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">商户编号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="MerchantNo" 
-                                autocomplete="off">
+                            <input class="layui-input" type="text" name="MerchantNo" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">商户名称</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="MerchantName" 
-                                autocomplete="off">
+                            <input class="layui-input" type="text" name="MerchantName" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
@@ -64,7 +69,7 @@
                             <input class="layui-input" type="text" name="MerRealName" autocomplete="off">
                         </div>
                     </div>
-                                    
+
                     <div class="layui-inline">
                         <label class="layui-form-label">上级创客编号</label>
                         <div class="layui-input-inline">
@@ -89,7 +94,7 @@
                             <input class="layui-input" type="text" name="ParentParentRealName" autocomplete="off">
                         </div>
                     </div>
-                
+
                     <div class="layui-inline">
                         <label class="layui-form-label">快钱商户编号</label>
                         <div class="layui-input-inline">
@@ -114,7 +119,7 @@
                             <input class="layui-input" type="text" name="RealName" autocomplete="off">
                         </div>
                     </div>
-                  
+
                     <div class="layui-inline">
                         <label class="layui-form-label">SN仓库编号</label>
                         <div class="layui-input-inline">
@@ -126,12 +131,12 @@
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="StoreName" autocomplete="off">
                         </div>
-                    </div>                    
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">激活时间</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" readonly name="ActDateData" id="ActDate"
-                             autocomplete="off">
+                                autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
@@ -144,7 +149,7 @@
                             </select>
                         </div>
                     </div>
-                  
+
                     <div class="layui-inline">
                         <label class="layui-form-label">激活类型</label>
                         <div class="layui-input-inline">
@@ -157,7 +162,9 @@
                             </select>
                         </div>
                     </div>
-                    @{Dictionary<string, string> TopUserDic = new MySystem.DictionaryClass().getTopUserDic();}
+                    @{
+                        Dictionary<string, string> TopUserDic = new MySystem.DictionaryClass().getTopUserDic();
+                    }
                     <div class="layui-inline">
                         <label class="layui-form-label">顶级创客</label>
                         <div class="layui-input-inline">
@@ -165,7 +172,7 @@
                                 <option value="">全部...</option>
                                 @foreach (string key in TopUserDic.Keys)
                                 {
-                                <option value="@key">@TopUserDic[key]</option>
+                                    <option value="@key">@TopUserDic[key]</option>
                                 }
                             </select>
                         </div>
@@ -204,4 +211,5 @@
         var BrandId = '@BrandId';
     </script>
 </body>
+
 </html>

Areas/Admin/Views/MainServer/PosMachinesTwo/Index.cshtml

@@ -1,42 +1,50 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>机具库</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 85px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
         }
-        .w100{
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-                <div class="layui-form-item">                    
+                <input class="layui-input" type="hidden" name="ShowFlag" autocomplete="off">
+                <div class="layui-form-item">
                     <div class="layui-inline">
                         <label class="layui-form-label">创客编号</label>
                         <div class="layui-input-inline">
@@ -90,8 +98,8 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">激活时间</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" readonly name="ActivationDateData" id="ActivationTime"
-                                placeholder="激活时间" autocomplete="off">
+                            <input class="layui-input" type="text" readonly name="ActivationDateData"
+                                id="ActivationTime" placeholder="激活时间" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
@@ -101,7 +109,10 @@
                                 placeholder="绑定时间" autocomplete="off">
                         </div>
                     </div>
-                    @{Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
+                    @{
+                        Dictionary<string, string> ProfitObjectsActivesDic = new
+            MySystem.DictionaryClass().getKqProductBrandDic();
+                    }
                     <div class="layui-inline">
                         <label class="layui-form-label">品牌</label>
                         <div class="layui-input-inline">
@@ -109,7 +120,7 @@
                                 <option value="">全部...</option>
                                 @foreach (string key in ProfitObjectsActivesDic.Keys)
                                 {
-                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                    <option value="@key">@ProfitObjectsActivesDic[key]</option>
                                 }
                             </select>
                         </div>
@@ -123,9 +134,11 @@
                         </button>
                         @if (RightInfo.Contains("," + right + "_export,"))
                         {
-                        <button class="layui-btn" data-type="ExportExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                            <button class="layui-btn" data-type="ExportExcel"><i
+                                class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
                         }
-                        @* <button class="layui-btn" data-type="RejectStore"><i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>机具驳回仓库</button> *@
+                        @* <button class="layui-btn" data-type="RejectStore"><i class="layui-icon layui-icon-upload
+                            layuiadmin-button-btn"></i>机具驳回仓库</button> *@
                     </div>
                 </div>
             </div>
@@ -138,11 +151,11 @@
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
+                                <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
                     }
                     @if (RightInfo.Contains("," + right + "_Home,"))
                     {
-                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="home"><i class="layui-icon layui-icon-edit"></i>一键归位</a>
+                                <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="home"><i class="layui-icon layui-icon-edit"></i>一键归位</a>
                     }
                 </script>
             </div>
@@ -152,7 +165,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_main/PosMachinesTwo_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

Areas/Admin/Views/MainServer/PosMerchantInfoList/Index.cshtml

@@ -35,6 +35,7 @@
     <div class="layui-fluid">
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+                <input class="layui-input" type="hidden" name="ShowFlag" autocomplete="off">
                 <div class="layui-form-item">
                     <div class="layui-inline">
                         <label class="layui-form-label">身份证号</label>

Areas/Admin/Views/MainServer/StoreHouse/Index.cshtml

@@ -43,6 +43,7 @@
     <div class="layui-fluid">
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
+                <input class="layui-input" type="hidden" name="ShowFlag" autocomplete="off">
                 <div class="layui-form-item">
                     <div class="layui-inline">
                         <label class="layui-form-label">仓库编号</label>

Areas/Admin/Views/MainServer/UserAccount/Index.cshtml

@@ -39,6 +39,7 @@
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
+                    <input class="layui-input" type="hidden" name="ShowFlag" autocomplete="off">
                     <div class="layui-form-item">
                         <div class="layui-inline">
                             <label class="layui-form-label">创客编号</label>

Areas/Admin/Views/MainServer/UserAccountRecord/Index.cshtml

@@ -68,7 +68,7 @@
                         </div>
                     </div>
                 
-                    <div class="layui-inline">
+                    @* <div class="layui-inline">
                         <label class="layui-form-label">顶级创客</label>
                         <div class="layui-input-inline">
                             <select id="TopUserId" name="TopUserId" lay-search="">
@@ -79,7 +79,7 @@
                                 }
                             </select>
                         </div>
-                    </div>
+                    </div> *@
                     <div class="layui-inline">
                         <label class="layui-form-label">交易类型</label>
                         <div class="layui-input-inline">

Areas/Admin/Views/MainServer/Users/Index.cshtml

@@ -43,6 +43,7 @@
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
+                    <input class="layui-input" type="hidden" name="ShowFlag" autocomplete="off">
                     <div class="layui-form-item">
                         <div class="layui-inline">
                             <label class="layui-form-label">创客编号</label>

Startup.cs

@@ -152,11 +152,11 @@ namespace MySystem
         {
             Dictionary<string, Dictionary<string, string>> tables = new Dictionary<string, Dictionary<string, string>>();
             Library.OtherMySqlConn.connstr = Configuration["Setting:SqlConnStr"];
-            System.Data.DataTable tablecollection = Library.OtherMySqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'KxsMainServer'");
+            System.Data.DataTable tablecollection = Library.OtherMySqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'KxsMainServer2'");
             foreach (System.Data.DataRow subtable in tablecollection.Rows)
             {
                 Dictionary<string, string> Columns = new Dictionary<string, string>();
-                System.Data.DataTable columncollection = Library.OtherMySqlConn.dtable("select COLUMN_NAME,DATA_TYPE from information_schema.columns where table_schema = 'KxsMainServer' and TABLE_NAME='" + subtable["TABLE_NAME"].ToString() + "'");
+                System.Data.DataTable columncollection = Library.OtherMySqlConn.dtable("select COLUMN_NAME,DATA_TYPE from information_schema.columns where table_schema = 'KxsMainServer2' and TABLE_NAME='" + subtable["TABLE_NAME"].ToString() + "'");
                 foreach (System.Data.DataRow column in columncollection.Rows)
                 {
                     string datatype = column["DATA_TYPE"].ToString();

wwwroot/layuiadmin/modules_main/ActiveReward_Admin.js

@@ -37,17 +37,17 @@ layui.config({
         trigger: 'click',
         change: function (value, date, endDate) {
             var op = true;
-            if (date.year == endDate.year && endDate.month - date.month <= 1) {
-                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+            if (date.year == endDate.year && endDate.month - date.month <= 2) {
+                if (endDate.month - date.month == 2 && endDate.date > date.date) {
                     op = false;
-                    layCreateDate.hint('日期范围请不要超过1个月');
+                    layCreateDate.hint('日期范围请不要超过2个月');
                     setTimeout(function () {
                         $(".laydate-btns-confirm").addClass("laydate-disabled");
                     }, 1);
                 }
             } else {
                 op = false;
-                layCreateDate.hint('日期范围请不要超过1个月');
+                layCreateDate.hint('日期范围请不要超过2个月');
                 setTimeout(function () {
                     $(".laydate-btns-confirm").addClass("laydate-disabled");
                 }, 1);

wwwroot/layuiadmin/modules_main/PosMachinesTwo_Admin.js

@@ -255,6 +255,7 @@ layui.config({
     //监听搜索
     form.on('submit(LAY-list-front-search)', function (data) {
         var field = data.field;
+        field.ShowFlag = 1;
 
         //执行重载
         table.reload('LAY-list-manage', {

wwwroot/layuiadmin/modules_main/PosMerchantInfoList_Admin.js

@@ -291,6 +291,7 @@ layui.config({
     //监听搜索
     form.on('submit(LAY-list-front-search)', function (data) {
         var field = data.field;
+        field.ShowFlag = 1;
 
         //执行重载
         table.reload('LAY-list-manage', {

wwwroot/layuiadmin/modules_main/ProfitRewardRecord_Admin.js

@@ -40,17 +40,17 @@ layui.config({
         trigger: 'click',
         change: function (value, date, endDate) {
             var op = true;
-            if (date.year == endDate.year && endDate.month - date.month <= 1) {
-                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+            if (date.year == endDate.year && endDate.month - date.month <= 2) {
+                if (endDate.month - date.month == 2 && endDate.date > date.date) {
                     op = false;
-                    layCreateDate.hint('日期范围请不要超过1个月');
+                    layCreateDate.hint('日期范围请不要超过2个月');
                     setTimeout(function () {
                         $(".laydate-btns-confirm").addClass("laydate-disabled");
                     }, 1);
                 }
             } else {
                 op = false;
-                layCreateDate.hint('日期范围请不要超过1个月');
+                layCreateDate.hint('日期范围请不要超过2个月');
                 setTimeout(function () {
                     $(".laydate-btns-confirm").addClass("laydate-disabled");
                 }, 1);

wwwroot/layuiadmin/modules_main/StoreHouse_Admin.js

@@ -276,11 +276,12 @@ layui.config({
                 title: '临时额度',
                 sort: true
             }, {
-                field: 'LeaderBalanceAmount',
+                field: 'PromissAmount',
                 width: 110,
                 title: '担保额度',
                 sort: true
-            }, {
+            }
+            , {
                 title: '操作',
                 width: 300,
                 align: 'center',
@@ -472,6 +473,7 @@ layui.config({
     //监听搜索
     form.on('submit(LAY-list-front-search)', function (data) {
         var field = data.field;
+        field.ShowFlag = 1;
 
         //执行重载
         table.reload('LAY-list-manage', {

wwwroot/layuiadmin/modules_main/StoreMachineApply_Admin.js

@@ -1,4 +1,5 @@
 var ExcelData, ExcelKind;
+var clickflag = 0;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -170,7 +171,7 @@ layui.config({
                         var BrandId = $(this).val();
                         var ApplyNum = ApplyNums.eq(i).val();
                         SendSn += '{"BrandId":' + BrandId + ',"ApplyNum":' + ApplyNum + '}';
-                        if(i < ApplyNums.length - 1) {
+                        if (i < ApplyNums.length - 1) {
                             SendSn += ',';
                         }
                     });
@@ -213,8 +214,7 @@ layui.config({
             });
             // layer.full(perContent);
         } else if (obj.event === 'Close') {
-            var index = layer.confirm('是否确定驳回?驳回后使用额度将返回该创客的可用额度', function (index)
-            {
+            var index = layer.confirm('是否确定驳回?驳回后使用额度将返回该创客的可用额度', function (index) {
                 $.ajax({
                     type: "POST",
                     url: "/Admin/StoreMachineApply/Close?r=" + Math.random(1),
@@ -258,259 +258,261 @@ layui.config({
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
-                        var field = data.field; //获取提交的字段
-                        var userdata = "";
-                        for (var prop in field) {
-                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
-                        }
-                        //提交 Ajax 成功后，静态更新表格中的数据
-                        //$.ajax({});
-
-                        $.ajax({
-                            type: "POST",
-                            url: "/Admin/StoreMachineApply/AuditSend?r=" + Math.random(1),
-                            data: userdata,
-                            dataType: "text",
-                            success: function (data) {
-                                if (data == "success") {
-                                    layer.close(index); //关闭弹层
-                                    layer.msg('发货成功', {
-                                        time: 1500
-                                    }, function () {
-                                        table.reload('LAY-list-manage'); //数据刷新
-                                    });
-                                } else if (data.indexOf("Warning") == 0) {
-                                    var datalist = data.split('|');
-                                    layer.alert(datalist[1], { time: 20000 }, function () {
-                                        window.location.reload();
-                                    });
-                                } else {
-                                    layer.close(index); //关闭弹层
-                                    layer.msg('审核完成', {
-                                        time: 1500
-                                    }, function () {
-                                        table.reload('LAY-list-manage'); //数据刷新
-                                    });
-                                }
+                        if(clickflag == 0) {
+                            clickflag = 1;
+                            var field = data.field; //获取提交的字段
+                            var userdata = "";
+                            for (var prop in field) {
+                                userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
                             }
-                        });
+                            //提交 Ajax 成功后，静态更新表格中的数据
+                            //$.ajax({});
+                            $.ajax({
+                                type: "POST",
+                                url: "/Admin/StoreMachineApply/AuditSend?r=" + Math.random(1),
+                                data: userdata,
+                                dataType: "text",
+                                success: function (data) {
+                                    clickflag = 0;
+                                    if (data == "success") {
+                                        layer.close(index); //关闭弹层
+                                        layer.msg('发货成功', {
+                                            time: 1500
+                                        }, function () {
+                                            table.reload('LAY-list-manage'); //数据刷新
+                                        });
+                                    } else if (data.indexOf("Warning") == 0) {
+                                        var datalist = data.split('|');
+                                        layer.alert(datalist[1], { time: 20000 }, function () {
+                                            window.location.reload();
+                                        });
+                                    } else {
+                                        layer.close(index); //关闭弹层
+                                        layer.msg('审核完成', {
+                                            time: 1500
+                                        }, function () {
+                                            table.reload('LAY-list-manage'); //数据刷新
+                                        });
+                                    }
+                                }
+                            });
+                        }
                     });
-
                     submit.trigger('click');
                 },
                 success: function (layero, index) {
 
                 }
             });
-        }
+}
     });
 
 
-    //监听搜索
-    form.on('submit(LAY-list-front-search)', function (data) {
-        var field = data.field;
+//监听搜索
+form.on('submit(LAY-list-front-search)', function (data) {
+    var field = data.field;
 
-        //执行重载
-        table.reload('LAY-list-manage', {
-            where: field,
-            page: {
-                curr: 1
-            }
-        });
+    //执行重载
+    table.reload('LAY-list-manage', {
+        where: field,
+        page: {
+            curr: 1
+        }
     });
-    form.on('submit(LAY-list-front-searchall)', function (data) {
-        table.reload('LAY-list-manage', {
-            where: null,
-            page: {
-                curr: 1
-            }
-        });
+});
+form.on('submit(LAY-list-front-searchall)', function (data) {
+    table.reload('LAY-list-manage', {
+        where: null,
+        page: {
+            curr: 1
+        }
     });
-
-    //事件
-    var active = {
-        batchdel: function () {
-            var checkStatus = table.checkStatus('LAY-list-manage')
-                , data = checkStatus.data; //得到选中的数据
-            if (data.length < 1) {
-                parent.layer.msg("请选择要删除的项");
-            } else {
-                var ids = "";
-                $.each(data, function (index, value) {
-                    ids += data[index].Id + ",";
-                });
-                ids = ids.substring(0, ids.length - 1);
-                var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
-                    $.ajax({
-                        type: "POST",
-                        url: "/Admin/StoreMachineApply/Delete?r=" + Math.random(1),
-                        data: "Id=" + ids,
-                        dataType: "text",
-                        success: function (data) {
-                            layer.close(index);
-                            if (data == "success") {
-                                table.reload('LAY-list-manage');
-                            } else {
-                                layer.msg(data);
-                            }
+});
+
+//事件
+var active = {
+    batchdel: function () {
+        var checkStatus = table.checkStatus('LAY-list-manage')
+            , data = checkStatus.data; //得到选中的数据
+        if (data.length < 1) {
+            parent.layer.msg("请选择要删除的项");
+        } else {
+            var ids = "";
+            $.each(data, function (index, value) {
+                ids += data[index].Id + ",";
+            });
+            ids = ids.substring(0, ids.length - 1);
+            var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
+                $.ajax({
+                    type: "POST",
+                    url: "/Admin/StoreMachineApply/Delete?r=" + Math.random(1),
+                    data: "Id=" + ids,
+                    dataType: "text",
+                    success: function (data) {
+                        layer.close(index);
+                        if (data == "success") {
+                            table.reload('LAY-list-manage');
+                        } else {
+                            layer.msg(data);
                         }
-                    });
+                    }
                 });
-            }
+            });
         }
-        , add: function () {
-            var perContent = layer.open({
-                type: 2
-                , title: '分仓机具申请记录-添加'
-                , content: 'Add'
-                , maxmin: true
-                , area: ['500px', '450px']
-                , btn: ['确定', '取消']
-                , yes: function (index, layero) {
-                    var iframeWindow = window['layui-layer-iframe' + index]
-                        , submitID = 'LAY-list-front-submit'
-                        , submit = layero.find('iframe').contents().find('#' + submitID);
+    }
+    , add: function () {
+        var perContent = layer.open({
+            type: 2
+            , title: '分仓机具申请记录-添加'
+            , content: 'Add'
+            , maxmin: true
+            , area: ['500px', '450px']
+            , btn: ['确定', '取消']
+            , yes: function (index, layero) {
+                var iframeWindow = window['layui-layer-iframe' + index]
+                    , submitID = 'LAY-list-front-submit'
+                    , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () {
-                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
-                            var errObj = $(this).find('.layui-form-danger');
-                            if (errObj.length > 0) {
-                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
-                                submit.click();
-                            }
-                        });
-                    }, 300);
+                setTimeout(function () {
+                    layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                        var errObj = $(this).find('.layui-form-danger');
+                        if (errObj.length > 0) {
+                            iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                            submit.click();
+                        }
+                    });
+                }, 300);
 
 
 
 
 
 
-                    //监听提交
-                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
-                        var field = data.field; //获取提交的字段
-                        var userdata = "";
-                        for (var prop in field) {
-                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
-                        }
-                        //提交 Ajax 成功后，静态更新表格中的数据
-                        //$.ajax({});
-
-                        $.ajax({
-                            type: "POST",
-                            url: "/Admin/StoreMachineApply/Add?r=" + Math.random(1),
-                            data: userdata,
-                            dataType: "text",
-                            success: function (data) {
-                                layer.close(index); //关闭弹层
-                                if (data == "success") {
-                                    table.reload('LAY-list-manage'); //数据刷新
-                                } else {
-                                    layer.msg(data);
-                                }
-                            }
-                        });
-                    });
+                //监听提交
+                iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                    var field = data.field; //获取提交的字段
+                    var userdata = "";
+                    for (var prop in field) {
+                        userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                    }
+                    //提交 Ajax 成功后，静态更新表格中的数据
+                    //$.ajax({});
 
-                    submit.trigger('click');
-                }
-            });
-            layer.full(perContent);
-        }
-        , ImportData: function () {
-            ExcelKind = 1;
-            layer.open({
-                type: 1,
-                title: '导入',
-                maxmin: false,
-                area: ['460px', '280px'],
-                content: $('#excelForm'),
-                cancel: function () {
-                }
-            });
-            $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
-        }
-        , ExportExcel: function () {
-            var userdata = '';
-            $(".layuiadmin-card-header-auto input").each(function (i) {
-                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
-            });
-            $(".layuiadmin-card-header-auto select").each(function (i) {
-                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
-            });
-            $.ajax({
-                type: "GET",
-                url: "/Admin/StoreMachineApply/ExportExcel?r=" + Math.random(1),
-                data: userdata,
-                dataType: "json",
-                success: function (data) {
-                    data.Obj.unshift(data.Fields);
-                    excel.exportExcel(data.Obj, data.Info, 'xlsx');
-                }
-            });
-        }
-        , Open: function () {
-            var checkStatus = table.checkStatus('LAY-list-manage')
-                , data = checkStatus.data; //得到选中的数据
-            if (data.length < 1) {
-                parent.layer.msg("请选择要开启的项");
-            } else {
-                var ids = "";
-                $.each(data, function (index, value) {
-                    ids += data[index].Id + ",";
-                });
-                ids = ids.substring(0, ids.length - 1);
-                var index = layer.confirm('确定要开启吗？', function (index) {
                     $.ajax({
                         type: "POST",
-                        url: "/Admin/StoreMachineApply/Open?r=" + Math.random(1),
-                        data: "Id=" + ids,
+                        url: "/Admin/StoreMachineApply/Add?r=" + Math.random(1),
+                        data: userdata,
                         dataType: "text",
                         success: function (data) {
-                            layer.close(index);
+                            layer.close(index); //关闭弹层
                             if (data == "success") {
-                                table.reload('LAY-list-manage');
+                                table.reload('LAY-list-manage'); //数据刷新
                             } else {
                                 layer.msg(data);
                             }
                         }
                     });
                 });
+
+                submit.trigger('click');
             }
-        }
-        , Close: function () {
-            var checkStatus = table.checkStatus('LAY-list-manage')
-                , data = checkStatus.data; //得到选中的数据
-            if (data.length < 1) {
-                parent.layer.msg("请选择要关闭的项");
-            } else {
-                var ids = "";
-                $.each(data, function (index, value) {
-                    ids += data[index].Id + ",";
+        });
+        layer.full(perContent);
+    }
+    , ImportData: function () {
+        ExcelKind = 1;
+        layer.open({
+            type: 1,
+            title: '导入',
+            maxmin: false,
+            area: ['460px', '280px'],
+            content: $('#excelForm'),
+            cancel: function () {
+            }
+        });
+        $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
+    }
+    , ExportExcel: function () {
+        var userdata = '';
+        $(".layuiadmin-card-header-auto input").each(function (i) {
+            userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+        });
+        $(".layuiadmin-card-header-auto select").each(function (i) {
+            userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+        });
+        $.ajax({
+            type: "GET",
+            url: "/Admin/StoreMachineApply/ExportExcel?r=" + Math.random(1),
+            data: userdata,
+            dataType: "json",
+            success: function (data) {
+                data.Obj.unshift(data.Fields);
+                excel.exportExcel(data.Obj, data.Info, 'xlsx');
+            }
+        });
+    }
+    , Open: function () {
+        var checkStatus = table.checkStatus('LAY-list-manage')
+            , data = checkStatus.data; //得到选中的数据
+        if (data.length < 1) {
+            parent.layer.msg("请选择要开启的项");
+        } else {
+            var ids = "";
+            $.each(data, function (index, value) {
+                ids += data[index].Id + ",";
+            });
+            ids = ids.substring(0, ids.length - 1);
+            var index = layer.confirm('确定要开启吗？', function (index) {
+                $.ajax({
+                    type: "POST",
+                    url: "/Admin/StoreMachineApply/Open?r=" + Math.random(1),
+                    data: "Id=" + ids,
+                    dataType: "text",
+                    success: function (data) {
+                        layer.close(index);
+                        if (data == "success") {
+                            table.reload('LAY-list-manage');
+                        } else {
+                            layer.msg(data);
+                        }
+                    }
                 });
-                ids = ids.substring(0, ids.length - 1);
-                var index = layer.confirm('确定要关闭吗？', function (index) {
-                    $.ajax({
-                        type: "POST",
-                        url: "/Admin/StoreMachineApply/Close?r=" + Math.random(1),
-                        data: "Id=" + ids,
-                        dataType: "text",
-                        success: function (data) {
-                            layer.close(index);
-                            if (data == "success") {
-                                table.reload('LAY-list-manage');
-                            } else {
-                                layer.msg(data);
-                            }
+            });
+        }
+    }
+    , Close: function () {
+        var checkStatus = table.checkStatus('LAY-list-manage')
+            , data = checkStatus.data; //得到选中的数据
+        if (data.length < 1) {
+            parent.layer.msg("请选择要关闭的项");
+        } else {
+            var ids = "";
+            $.each(data, function (index, value) {
+                ids += data[index].Id + ",";
+            });
+            ids = ids.substring(0, ids.length - 1);
+            var index = layer.confirm('确定要关闭吗？', function (index) {
+                $.ajax({
+                    type: "POST",
+                    url: "/Admin/StoreMachineApply/Close?r=" + Math.random(1),
+                    data: "Id=" + ids,
+                    dataType: "text",
+                    success: function (data) {
+                        layer.close(index);
+                        if (data == "success") {
+                            table.reload('LAY-list-manage');
+                        } else {
+                            layer.msg(data);
                         }
-                    });
+                    }
                 });
-            }
+            });
         }
-    };
+    }
+};
 
-    $('.layui-btn').on('click', function () {
-        var type = $(this).data('type');
-        active[type] ? active[type].call(this) : '';
-    });
+$('.layui-btn').on('click', function () {
+    var type = $(this).data('type');
+    active[type] ? active[type].call(this) : '';
+});
 });

wwwroot/layuiadmin/modules_main/SysRechargeRecord_Admin.js

@@ -37,17 +37,17 @@ layui.config({
         trigger: 'click',
         change: function (value, date, endDate) {
             var op = true;
-            if (date.year == endDate.year && endDate.month - date.month <= 1) {
-                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+            if (date.year == endDate.year && endDate.month - date.month <= 2) {
+                if (endDate.month - date.month == 2 && endDate.date > date.date) {
                     op = false;
-                    layCreateDate.hint('日期范围请不要超过1个月');
+                    layCreateDate.hint('日期范围请不要超过2个月');
                     setTimeout(function () {
                         $(".laydate-btns-confirm").addClass("laydate-disabled");
                     }, 1);
                 }
             } else {
                 op = false;
-                layCreateDate.hint('日期范围请不要超过1个月');
+                layCreateDate.hint('日期范围请不要超过2个月');
                 setTimeout(function () {
                     $(".laydate-btns-confirm").addClass("laydate-disabled");
                 }, 1);

wwwroot/layuiadmin/modules_main/TradeDaySummary_Admin.js

@@ -37,17 +37,17 @@ layui.config({
         trigger: 'click',
         change: function (value, date, endDate) {
             var op = true;
-            if (date.year == endDate.year && endDate.month - date.month <= 1) {
-                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+            if (date.year == endDate.year && endDate.month - date.month <= 2) {
+                if (endDate.month - date.month == 2 && endDate.date > date.date) {
                     op = false;
-                    layCreateDate.hint('日期范围请不要超过1个月');
+                    layCreateDate.hint('日期范围请不要超过2个月');
                     setTimeout(function () {
                         $(".laydate-btns-confirm").addClass("laydate-disabled");
                     }, 1);
                 }
             } else {
                 op = false;
-                layCreateDate.hint('日期范围请不要超过1个月');
+                layCreateDate.hint('日期范围请不要超过2个月');
                 setTimeout(function () {
                     $(".laydate-btns-confirm").addClass("laydate-disabled");
                 }, 1);

wwwroot/layuiadmin/modules_main/TradeRecord_Admin.js

@@ -64,17 +64,17 @@ layui.config({
         range: true,
         change: function (value, date, endDate) {
             var op = true;
-            if (date.year == endDate.year && endDate.month - date.month <= 1) {
-                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+            if (date.year == endDate.year && endDate.month - date.month <= 2) {
+                if (endDate.month - date.month == 2 && endDate.date > date.date) {
                     op = false;
-                    layTradeDate.hint('日期范围请不要超过1个月');
+                    layTradeDate.hint('日期范围请不要超过2个月');
                     setTimeout(function () {
                         $(".laydate-btns-confirm").addClass("laydate-disabled");
                     }, 1);
                 }
             } else {
                 op = false;
-                layTradeDate.hint('日期范围请不要超过1个月');
+                layTradeDate.hint('日期范围请不要超过2个月');
                 setTimeout(function () {
                     $(".laydate-btns-confirm").addClass("laydate-disabled");
                 }, 1);

wwwroot/layuiadmin/modules_main/UserAccountRecord_Admin.js

@@ -37,17 +37,17 @@ layui.config({
         trigger: 'click',
         change: function (value, date, endDate) {
             var op = true;
-            if (date.year == endDate.year && endDate.month - date.month <= 1) {
-                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+            if (date.year == endDate.year && endDate.month - date.month <= 2) {
+                if (endDate.month - date.month == 2 && endDate.date > date.date) {
                     op = false;
-                    layCreateDate.hint('日期范围请不要超过1个月');
+                    layCreateDate.hint('日期范围请不要超过2个月');
                     setTimeout(function () {
                         $(".laydate-btns-confirm").addClass("laydate-disabled");
                     }, 1);
                 }
             } else {
                 op = false;
-                layCreateDate.hint('日期范围请不要超过1个月');
+                layCreateDate.hint('日期范围请不要超过2个月');
                 setTimeout(function () {
                     $(".laydate-btns-confirm").addClass("laydate-disabled");
                 }, 1);

wwwroot/layuiadmin/modules_main/UserAccount_Admin.js

@@ -319,6 +319,7 @@ layui.config({
     //监听搜索
     form.on('submit(LAY-list-front-search)', function (data) {
         var field = data.field;
+        field.ShowFlag = 1;
 
         //执行重载
         table.reload('LAY-list-manage', {

wwwroot/layuiadmin/modules_main/UserTradeDaySummary_Admin.js

@@ -37,17 +37,17 @@ layui.config({
         trigger: 'click',
         change: function (value, date, endDate) {
             var op = true;
-            if (date.year == endDate.year && endDate.month - date.month <= 1) {
-                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+            if (date.year == endDate.year && endDate.month - date.month <= 2) {
+                if (endDate.month - date.month == 2 && endDate.date > date.date) {
                     op = false;
-                    layCreateDate.hint('日期范围请不要超过1个月');
+                    layCreateDate.hint('日期范围请不要超过2个月');
                     setTimeout(function () {
                         $(".laydate-btns-confirm").addClass("laydate-disabled");
                     }, 1);
                 }
             } else {
                 op = false;
-                layCreateDate.hint('日期范围请不要超过1个月');
+                layCreateDate.hint('日期范围请不要超过2个月');
                 setTimeout(function () {
                     $(".laydate-btns-confirm").addClass("laydate-disabled");
                 }, 1);

wwwroot/layuiadmin/modules_main/UserTradeMonthSummary_Admin.js

@@ -37,15 +37,15 @@ layui.config({
         trigger: 'click',
         change: function (value, date, endDate) {
             var op = true;
-            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+            if (date.year == endDate.year && endDate.month - date.month <= 2) {
                 op = false;
-                layCreateDate.hint('范围请不要超过1个月');
+                layCreateDate.hint('范围请不要超过2个月');
                 setTimeout(function () {
                     $(".laydate-btns-confirm").addClass("laydate-disabled");
                 }, 1);
             } else {
                 op = false;
-                layCreateDate.hint('范围请不要超过1个月');
+                layCreateDate.hint('范围请不要超过2个月');
                 setTimeout(function () {
                     $(".laydate-btns-confirm").addClass("laydate-disabled");
                 }, 1);

wwwroot/layuiadmin/modules_main/UsersChildren_Admin.js

@@ -42,17 +42,17 @@ layui.config({
         trigger: 'click',
         change: function (value, date, endDate) {
             var op = true;
-            if (date.year == endDate.year && endDate.month - date.month <= 1) {
-                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+            if (date.year == endDate.year && endDate.month - date.month <= 2) {
+                if (endDate.month - date.month == 2 && endDate.date > date.date) {
                     op = false;
-                    layCreateDate.hint('日期范围请不要超过1个月');
+                    layCreateDate.hint('日期范围请不要超过2个月');
                     setTimeout(function () {
                         $(".laydate-btns-confirm").addClass("laydate-disabled");
                     }, 1);
                 }
             } else {
                 op = false;
-                layCreateDate.hint('日期范围请不要超过1个月');
+                layCreateDate.hint('日期范围请不要超过2个月');
                 setTimeout(function () {
                     $(".laydate-btns-confirm").addClass("laydate-disabled");
                 }, 1);

wwwroot/layuiadmin/modules_main/Users_Admin.js

@@ -671,6 +671,7 @@ layui.config({
     //监听搜索
     form.on('submit(LAY-list-front-search)', function (data) {
         var field = data.field;
+        field.ShowFlag = 1;
 
         //执行重载
         table.reload('LAY-list-manage', {