Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/MainServer/ActiveRewardController.cs

@@ -163,6 +163,11 @@ namespace MySystem.Areas.Admin.Controllers
                         function.WritePage("/WritePage/ActiveReward/", "ActiveReward" + BrandId + ".txt", minId.ToString());
                         condition += " and Id >=" + minId;
                     }
+                    else if (minId != int.Parse(Info))
+                    {
+                        function.WritePage("/WritePage/ActiveReward/", "ActiveReward" + BrandId + ".txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
                     else
                     {
                         condition += " and Id >=" + Convert.ToInt32(Info);

Areas/Admin/Controllers/MainServer/ProfitRewardRecordController.cs

@@ -96,34 +96,39 @@ namespace MySystem.Areas.Admin.Controllers
             if (!string.IsNullOrEmpty(CreateDateData))
             {
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                var start = Convert.ToDateTime(datelist[0]).ToString("yyyyMMdd");
-                var end = Convert.ToDateTime(datelist[1]).ToString("yyyyMMdd");
-                var check = db.ProfitRewardRecord.Any(m => Convert.ToInt32(m.SeoTitle) >= Convert.ToInt32(start) && m.BrandId == Convert.ToInt32(BrandId));
-                var checks = db.ProfitRewardRecord.Any(m => Convert.ToInt32(m.SeoTitle) <= Convert.ToInt32(end) && m.BrandId == Convert.ToInt32(BrandId));
+                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 => Convert.ToInt32(m.SeoTitle) >= Convert.ToInt32(start)  && m.BrandId == Convert.ToInt32(BrandId)).Min(m => m.Id);
+                    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 => Convert.ToInt32(m.SeoTitle) <= Convert.ToInt32(end) && m.BrandId == Convert.ToInt32(BrandId)).Max(m => m.Id);
+                    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 = DateTime.Now.AddMonths(-1).ToString("yyyyMM") + "01";
-                var check = db.ProfitRewardRecord.Any(m => Convert.ToInt32(m.SeoTitle) >= Convert.ToInt32(start) && m.BrandId == Convert.ToInt32(BrandId));
+                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01");
+                var check = db.ProfitRewardRecord.Any(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId));
                 if (check)
                 {
-                    var minId = db.ProfitRewardRecord.Where(m => Convert.ToInt32(m.SeoTitle) >= Convert.ToInt32(start) && m.BrandId == Convert.ToInt32(BrandId)).Min(m => m.Id);
+                    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" + BrandId + ".txt");
                     if (string.IsNullOrEmpty(Info.ToString()))
                     {
                         function.WritePage("/WritePage/ProfitRewardRecord/", "ProfitRewardRecord" + BrandId + ".txt", minId.ToString());
                         condition += " and Id >=" + minId;
                     }
+                    else if (minId != int.Parse(Info))
+                    {
+                        function.WritePage("/WritePage/ProfitRewardRecord/", "ProfitRewardRecord" + BrandId + ".txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
                     else
                     {
                         condition += " and Id >=" + Convert.ToInt32(Info);

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -4953,6 +4953,7 @@ namespace MySystem.Areas.Admin.Controllers
         {
             string conn = Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            var RealName = "";
             string condition = " where 1=1";
             var UserId = 0;
             var bstart = "";
@@ -4963,6 +4964,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 var user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new Users();
                 UserId = user.Id;
+                RealName = user.RealName;
             }
             if (!string.IsNullOrEmpty(BindingTime))
             {
@@ -4996,7 +4998,7 @@ namespace MySystem.Areas.Admin.Controllers
             var Sql = "select wname '伙伴名称',k.`Name` '机具品牌',PosSn '机具Sn',(CASE WHEN tb.SeoKeyword IS NULL AND tb.PrizeParams=0 THEN 0 ELSE tb.SeoKeyword END) '服务费',DATE_FORMAT(BindingTime,'%Y-%m-%d %H:%i:%s') '绑定时间',DATE_FORMAT(ActivationTime,'%Y-%m-%d %H:%i:%s') '激活时间' from (select (select Name from BusinessPartner where Id=(select PartnerId from BusinessPartnerPos where PosId=pos.Id and `Status`>-1 limit 1)) wname,BrandId,PosSnType,PosSn,(CASE WHEN BrandId not in(2,7,10,11) THEN ROUND(CAST(SeoKeyword AS DECIMAL)/100, 2) ELSE SeoKeyword end) SeoKeyword,TransferTime,BindingTime,ActivationTime,PrizeParams from PosMachinesTwo pos where BindingState=1 and `Status`>=-1 and BuyUserId=" + UserId + "  and Id in (select PosId from BusinessPartnerPos)) tb left join KqProducts k on tb.BrandId=k.Id" + condition;
 
             var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
-            var FileName = "直营团队数据记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            var FileName = MakerCode + RealName + "直营团队数据记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
             return "success";

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -144,6 +144,11 @@ namespace MySystem.Areas.Admin.Controllers
                         function.WritePage("/WritePage/TradeRecord/", "TradeRecord" + BrandId + ".txt", minId.ToString());
                         condition += " and Id >=" + minId;
                     }
+                    else if (minId != int.Parse(Info))
+                    {
+                        function.WritePage("/WritePage/TradeRecord/", "TradeRecord" + BrandId + ".txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
                     else
                     {
                         condition += " and Id >=" + Convert.ToInt32(Info);

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -116,6 +116,11 @@ namespace MySystem.Areas.Admin.Controllers
                         function.WritePage("/WritePage/UsersAccountRecord/", "UsersAccountRecord.txt", minId.ToString());
                         condition += " and Id >=" + minId;
                     }
+                    else if (minId != int.Parse(Info))
+                    {
+                        function.WritePage("/WritePage/UsersAccountRecord/", "UsersAccountRecord.txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
                     else
                     {
                         condition += " and Id >=" + Convert.ToInt32(Info);

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -137,6 +137,11 @@ namespace MySystem.Areas.Admin.Controllers
                         function.WritePage("/WritePage/UserCashRecord/", "UserCashRecord.txt", minId.ToString());
                         condition += " and Id >=" + minId;
                     }
+                    else if (minId != int.Parse(Info))
+                    {
+                        function.WritePage("/WritePage/UserCashRecord/", "UserCashRecord.txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
                     else
                     {
                         condition += " and Id >=" + Convert.ToInt32(Info);
@@ -569,6 +574,11 @@ namespace MySystem.Areas.Admin.Controllers
                         function.WritePage("/WritePage/UserCashRecord/", "UserCashRecord.txt", minId.ToString());
                         condition += " and Id >=" + minId;
                     }
+                    else if (minId != int.Parse(Info))
+                    {
+                        function.WritePage("/WritePage/UserCashRecord/", "UserCashRecord.txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
                     else
                     {
                         condition += " and Id >=" + Convert.ToInt32(Info);
@@ -730,6 +740,11 @@ namespace MySystem.Areas.Admin.Controllers
                         function.WritePage("/WritePage/UserCashRecord/", "LeaderUserCashRecord.txt", minId.ToString());
                         condition += " and Id >=" + minId;
                     }
+                    else if (minId != int.Parse(Info))
+                    {
+                        function.WritePage("/WritePage/UserCashRecord/", "LeaderUserCashRecord.txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
                     else
                     {
                         condition += " and Id >=" + Convert.ToInt32(Info);

Areas/Admin/Controllers/OperateServer/AmountRecordOperateController.cs

@@ -101,6 +101,11 @@ namespace MySystem.Areas.Admin.Controllers
                         function.WritePage("/WritePage/AmountRecordOperate/", "AmountRecordOperate.txt", minId.ToString());
                         condition += " and Id >=" + minId;
                     }
+                    else if (minId != int.Parse(Info))
+                    {
+                        function.WritePage("/WritePage/AmountRecordOperate/", "AmountRecordOperate.txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
                     else
                     {
                         condition += " and Id >=" + Convert.ToInt32(Info);

Areas/Admin/Controllers/OperateServer/UserAccountRecordOperateController.cs

@@ -98,10 +98,15 @@ namespace MySystem.Areas.Admin.Controllers
                 if (check)
                 {
                     var minId = db.UserAccountRecord.Where(m => m.CreateDate >= start).Min(m => m.Id);
-                    var Info = function.ReadInstance("/WritePage/UsersAccountRecord/UsersAccountRecord.txt");
+                    var Info = function.ReadInstance("/WritePage/OpUsersAccountRecord/UsersAccountRecord.txt");
                     if (string.IsNullOrEmpty(Info.ToString()))
                     {
-                        function.WritePage("/WritePage/UsersAccountRecord/", "UsersAccountRecord.txt", minId.ToString());
+                        function.WritePage("/WritePage/OpUsersAccountRecord/", "UsersAccountRecord.txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
+                    else if (minId != int.Parse(Info))
+                    {
+                        function.WritePage("/WritePage/OpUsersAccountRecord/", "UsersAccountRecord.txt", minId.ToString());
                         condition += " and Id >=" + minId;
                     }
                     else

Areas/Admin/Controllers/OperateServer/UserCashRecordOperateController.cs

@@ -120,6 +120,11 @@ namespace MySystem.Areas.Admin.Controllers
                         function.WritePage("/WritePage/OpUserCashRecord/", "OpUserCashRecord.txt", minId.ToString());
                         condition += " and Id >=" + minId;
                     }
+                    else if (minId != int.Parse(Info))
+                    {
+                        function.WritePage("/WritePage/OpUserCashRecord/", "OpUserCashRecord.txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
                     else
                     {
                         condition += " and Id >=" + Convert.ToInt32(Info);

Areas/Admin/Controllers/OperateServer/UserCashRecordOperatesController.cs

@@ -119,6 +119,11 @@ namespace MySystem.Areas.Admin.Controllers
                         function.WritePage("/WritePage/OpUserCashRecord/", "OpUserCashRecord.txt", minId.ToString());
                         condition += " and Id >=" + minId;
                     }
+                    else if (minId != int.Parse(Info))
+                    {
+                        function.WritePage("/WritePage/OpUserCashRecord/", "OpUserCashRecord.txt", minId.ToString());
+                        condition += " and Id >=" + minId;
+                    }
                     else
                     {
                         condition += " and Id >=" + Convert.ToInt32(Info);

Areas/Admin/Controllers/SpServer/SpTradeRecordController.cs

@@ -57,7 +57,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             Fields.Add("MerNo", "1"); //商户编号
-            Fields.Add("MerSnNo", "1"); //机具号
+            Fields.Add("TradeSnNo", "1"); //机具号
             Fields.Add("ChannelSerial", "1"); //渠道流水号