调整

Areas/Admin/Controllers/MainServer/ProfitRewardRecordController.cs

@@ -104,32 +104,32 @@ namespace MySystem.Areas.Admin.Controllers
             if (!string.IsNullOrEmpty(CreateDateData))
             {
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                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));
+                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));
                 if (check)
                 {
-                    var sId = db.ProfitRewardRecord.Where(m => m.CreateDate >= start && m.BrandId == Convert.ToInt32(BrandId)).Min(m => m.Id);
+                    var sId = db.ProfitRewardRecord.Where(m => Convert.ToInt32(m.SeoTitle) >= Convert.ToInt32(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);
+                    var eId = db.ProfitRewardRecord.Where(m => Convert.ToInt32(m.SeoTitle) <= Convert.ToInt32(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));
+                var start = DateTime.Now.AddMonths(-1).ToString("yyyyMMdd");
+                var check = db.ProfitRewardRecord.Any(m => Convert.ToInt32(m.SeoTitle) >= Convert.ToInt32(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");
+                    var minId = db.ProfitRewardRecord.Where(m => Convert.ToInt32(m.SeoTitle) >= Convert.ToInt32(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.txt", minId.ToString());
+                        function.WritePage("/WritePage/ProfitRewardRecord/", "ProfitRewardRecord" + BrandId + ".txt", minId.ToString());
                         condition += " and Id >=" + minId;
                     }
                     else
@@ -216,7 +216,7 @@ namespace MySystem.Areas.Admin.Controllers
             string MerchantProfitAmount = "0.00";//商户交易分润总金额
             string CreditProfitAmount = "0.00";//贷记卡分润总金额
             // TODO: 读取太慢，要优化
-            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);
+            DataTable dt = OtherMySqlConn.dtable("SELECT SUM(if(BrandId=" + BrandId + ",TradeAmt,0)),SUM(if(BrandId=" + BrandId + ",CreditTradeAmt,0)),SUM(if(BrandId=" + BrandId + ",TradeProfit,0)),SUM(if(BrandId=" + 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();