修改TradeRecord读取表

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -142,51 +142,12 @@ namespace MySystem.Areas.Admin.Controllers
             }
             decimal CreditTrade = 0;
             string BindingTime = pos.BindingTime == null ? DateTime.Now.AddMonths(-1).ToString("yyyyMM") : pos.BindingTime.Value.ToString("yyyyMM");
-            string SpTradeRecordId = function.ReadInstance("/PublicParams/SpTradeRecordId" + BindingTime + ".txt");
-            int StartId = int.Parse(function.CheckInt(SpTradeRecordId));
-            bool check = spdb.TradeRecord.Any(m => m.Id > StartId && m.TradeSnNo == pos.PosSn);
+            string TradeRecordId = function.ReadInstance("/PublicParams/TradeRecordId" + BindingTime + ".txt");
+            int StartId = int.Parse(function.CheckInt(TradeRecordId));
+            bool check = db.TradeRecord.Any(m => m.Id > StartId && m.SnNo == pos.PosSn);
             if (check)
             {
-                if (pos.BrandId == 1)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M700")).Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 2)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "2").Sum(m => m.TradeAmount);
-                }
-                else if (pos.BrandId == 3)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M900")).Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 4 || pos.BrandId == 5)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "4").Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 6)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "6").Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 7)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "7" && m.TradeStatus == "00").Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 8)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "8").Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 9)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "9").Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 10 || pos.BrandId == 11)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "10").Sum(m => m.TradeAmount);
-                }
-                else if (pos.BrandId == 12 || pos.BrandId == 13)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "12").Sum(m => m.TradeAmount);
-                }
+                CreditTrade = db.TradeRecord.Where(m => m.Id > StartId && m.SnNo == pos.PosSn && m.BrandId == pos.BrandId).Sum(m => m.TradeAmount);
                 pos.CreditTrade = CreditTrade;
                 db.SaveChanges();
             }
@@ -414,48 +375,13 @@ namespace MySystem.Areas.Admin.Controllers
                 }
             }
             decimal CreditTrade = 0;
-            bool check = spdb.TradeRecord.Any(m => m.TradeSnNo == pos.PosSn);
+            string BindingTime = pos.BindingTime == null ? DateTime.Now.AddMonths(-1).ToString("yyyyMM") : pos.BindingTime.Value.ToString("yyyyMM");
+            string TradeRecordId = function.ReadInstance("/PublicParams/TradeRecordId" + BindingTime + ".txt");
+            int StartId = int.Parse(function.CheckInt(TradeRecordId));
+            bool check = db.TradeRecord.Any(m => m.Id > StartId && m.SnNo == pos.PosSn);
             if (check)
             {
-                string BindingTime = pos.BindingTime == null ? DateTime.Now.AddMonths(-1).ToString("yyyyMM") : pos.BindingTime.Value.ToString("yyyyMM");
-                string SpTradeRecordId = function.ReadInstance("/PublicParams/SpTradeRecordId" + BindingTime + ".txt");
-                int StartId = int.Parse(function.CheckInt(SpTradeRecordId));
-                if (pos.BrandId == 1)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M700")).Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 2)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "2").Sum(m => m.TradeAmount);
-                }
-                else if (pos.BrandId == 3)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M900")).Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 4 || pos.BrandId == 5)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "4").Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 6)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "6").Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 8)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "8").Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 9)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "9").Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 10 || pos.BrandId == 11)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "10").Sum(m => m.TradeAmount);
-                }
-                else if (pos.BrandId == 12 || pos.BrandId == 13)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "12").Sum(m => m.TradeAmount);
-                }
+                CreditTrade = db.TradeRecord.Where(m => m.Id > StartId && m.SnNo == pos.PosSn && m.BrandId == pos.BrandId).Sum(m => m.TradeAmount);
                 pos.CreditTrade = CreditTrade;
                 db.SaveChanges();
             }
@@ -639,51 +565,12 @@ namespace MySystem.Areas.Admin.Controllers
             }
             decimal CreditTrade = 0;
             string BindingTime = pos.BindingTime == null ? DateTime.Now.AddMonths(-1).ToString("yyyyMM") : pos.BindingTime.Value.ToString("yyyyMM");
-            string SpTradeRecordId = function.ReadInstance("/PublicParams/SpTradeRecordId" + BindingTime + ".txt");
-            int StartId = int.Parse(function.CheckInt(SpTradeRecordId));
-            bool check = spdb.TradeRecord.Any(m => m.Id > StartId && m.TradeSnNo == pos.PosSn);
+            string TradeRecordId = function.ReadInstance("/PublicParams/TradeRecordId" + BindingTime + ".txt");
+            int StartId = int.Parse(function.CheckInt(TradeRecordId));
+            bool check = db.TradeRecord.Any(m => m.Id > StartId && m.SnNo == pos.PosSn);
             if (check)
             {
-                if (pos.BrandId == 1)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M700")).Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 2)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "2").Sum(m => m.TradeAmount);
-                }
-                else if (pos.BrandId == 3)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M900")).Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 4 || pos.BrandId == 5)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "4").Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 6)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "6").Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 7)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "7" && m.TradeStatus == "00").Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 8)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "8").Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 9)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "9").Sum(m => m.TradeAmount) / 100;
-                }
-                else if (pos.BrandId == 10 || pos.BrandId == 11)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "10").Sum(m => m.TradeAmount);
-                }
-                else if (pos.BrandId == 12 || pos.BrandId == 13)
-                {
-                    CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "12").Sum(m => m.TradeAmount);
-                }
+                CreditTrade = db.TradeRecord.Where(m => m.Id > StartId && m.SnNo == pos.PosSn && m.BrandId == pos.BrandId).Sum(m => m.TradeAmount);
                 pos.CreditTrade = CreditTrade;
                 db.SaveChanges();
             }