Merge branch 'feature-dgy-BUG修复' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -577,6 +577,29 @@ namespace MySystem.Areas.Admin.Controllers
                     condition += " and Id <=" + eId;
                 }
             }
+            else
+            {
+                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01");
+                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";
+                }
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserAccountRecord", Fields, "Id desc", "0", 1, 20000, condition, "UserId,ProductType,TransRecordNo,ChangeType,ChangeAmount,Remark,BeforeTotalAmount,AfterTotalAmount,BeforeFreezeAmount,AfterFreezeAmount,BeforeBalanceAmount,AfterBalanceAmount,CreateDate", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -667,21 +690,41 @@ namespace MySystem.Areas.Admin.Controllers
             }
             if (ChangeType > 0)
             {
-                if (ChangeType == 1)
-                {
-                    SqlString += " and (a.ChangeType=" + ChangeType + " or (a.ChangeType in(112,1) and a.ProductType=101))";
-                }
-                else if (ChangeType == 30)
+                // if (ChangeType == 1)
+                // {
+                //     SqlString += " and (a.ChangeType=" + ChangeType + " or (a.ChangeType in(112,1) and a.ProductType=101))";
+                // }
+                // else if (ChangeType == 30)
+                // {
+                //     SqlString += " and a.ChangeType=31 and a.Remark='开机抢红包活动'";
+                // }
+                // else if (ChangeType == 31)
+                // {
+                //     SqlString += " and (a.ChangeType=" + ChangeType + " and (a.Remark!='开机抢红包活动' or a.Remark IS NULL))";
+                // }
+                // else
+                // {
+                //     SqlString += " and a.ChangeType=" + ChangeType;
+                // }
+
+                if (ChangeType > 0)
                 {
-                    SqlString += " and a.ChangeType=31 and a.Remark='开机抢红包活动'";
-                }
-                else if (ChangeType == 31)
-                {
-                    SqlString += " and (a.ChangeType=" + ChangeType + " and (a.Remark!='开机抢红包活动' or a.Remark IS NULL))";
+                    if (ChangeType == 1)
+                    {
+                        SqlString += " and (a.ChangeType=" + ChangeType + " or (a.ChangeType in(112,1) and a.ProductType=101))";
+                    }
+                    else if (ChangeType == 112)
+                    {
+                        SqlString += " and a.ChangeType=112 and a.ProductType=0";
+                    }
+                    else
+                    {
+                        SqlString += " and a.ChangeType=" + ChangeType;
+                    }
                 }
-                else
+                if (ChangeType == 0)
                 {
-                    SqlString += " and a.ChangeType=" + ChangeType;
+                    SqlString += " and a.ChangeType in(0,12)";
                 }
             }
             if (ProductType > 0)
@@ -710,6 +753,29 @@ namespace MySystem.Areas.Admin.Controllers
                     SqlString += " and a.Id <=" + eId;
                 }
             }
+            else
+            {
+                var start = Convert.ToDateTime(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01");
+                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());
+                        SqlString += " and a.Id >=" + minId;
+                    }
+                    else
+                    {
+                        SqlString += " and a.Id >=" + Convert.ToInt32(Info);
+                    }
+                }
+                else
+                {
+                    SqlString += " and a.Id =0";
+                }
+            }
             var Sql = "SELECT e.MakerCode '创客编号',e.RealName '创客姓名',f.MakerCode '顶级创客编号',f.RealName '顶级创客名称',e.`Name` '产品类型',e.TransRecordNo '交易流水编号',e.ChangeTypeName '交易类型',e.ChangeAmount '交易金额',e.Remark '备注',e.BeforeTotalAmount '交易前总金额',e.AfterTotalAmount '交易后总金额',e.BeforeFreezeAmount '交易前冻结金额',e.AfterFreezeAmount '交易后冻结金额',e.BeforeBalanceAmount '交易前余额',e.AfterBalanceAmount '交易后余额',DATE_FORMAT(e.CreateDate,'%Y-%m-%d %H:%i:%s') '交易时间' FROM (SELECT b.MakerCode,b.RealName,SUBSTRING_INDEX(SUBSTRING_INDEX(b.ParentNav,',',4),',',-1) topId,c.`Name`,a.TransRecordNo,d.`Name` ChangeTypeName,a.ChangeAmount,a.Remark,a.BeforeTotalAmount,a.AfterTotalAmount,a.BeforeFreezeAmount,a.AfterFreezeAmount,a.BeforeBalanceAmount,a.AfterBalanceAmount,a.CreateDate FROM UserAccountRecord a LEFT JOIN Users b ON a.UserId=b.Id LEFT JOIN KqProducts c ON a.ProductType=c.Id LEFT JOIN ChangeTypes d ON a.ChangeType=d.Id WHERE 1=1 " + SqlString + ") e LEFT JOIN Users f ON e.topId=f.Id";
             var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
             var FileName = "创客账户变动记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");