修复机具补录

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -158,6 +158,10 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "6").Sum(m => m.TradeAmount) / 100;
                 }
+                else if (pos.BrandId == 7)
+                {
+                    CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "7").Sum(m => m.TradeAmount) / 100;
+                }
                 pos.CreditTrade = CreditTrade;
                 db.SaveChanges();
                 StatTradeAmount(pos.PosSn);
@@ -186,14 +190,17 @@ namespace MySystem.Areas.Admin.Controllers
                         AddAct(pos.Id);
                     }
                 }
+            }            
+            decimal CheckMoney = 1000;
+            if(pos.BrandId == 6)
+            {
+                CheckMoney = 5000;
             }
             if (pos.BuyUserId > 0)
             {
-                if (pos.CreditTrade < 1000)
+                if (pos.CreditTrade < CheckMoney)
                 {
-                    pos.IsPurchase = 99;
-                    db.SaveChanges();
-                    return "该机具贷记卡累计交易不足1000";
+                    return "该机具贷记卡累计交易不足" + CheckMoney;
                 }
                 if (pos.BindingTime != null && pos.ActivationTime != null)
                 {
@@ -203,7 +210,7 @@ namespace MySystem.Areas.Admin.Controllers
                         return "机具划拨后已超过30天";
                     }
                 }
-                if (pos.CreditTrade >= 1000 && pos.ActivationState == 0)
+                if (pos.CreditTrade >= CheckMoney && pos.ActivationState == 0)
                 {
                     pos.IsPurchase = 0;
                     pos.ActivationState = 1;
@@ -216,7 +223,7 @@ namespace MySystem.Areas.Admin.Controllers
                         RedisDbconn.Instance.Clear("PosMerchantInfo:" + mer.Id);
                     }
                 }
-                else if (pos.CreditTrade >= 1000 && pos.ActivationState == 1)
+                else if (pos.CreditTrade >= CheckMoney && pos.ActivationState == 1)
                 {
                     if (AddActPrize == 1)
                     {
@@ -233,11 +240,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             pos.UserId = user.Id;
             pos.BuyUserId = user.Id;
-            if (pos.CreditTrade < 1000)
-            {
-                pos.IsPurchase = 99;
-            }
-            else if (pos.CreditTrade >= 1000 && pos.ActivationState == 0 && pos.BindingTime > DateTime.Now.AddDays(-30))
+            if (pos.CreditTrade >= CheckMoney && pos.ActivationState == 0 && pos.BindingTime > DateTime.Now.AddDays(-30))
             {
                 pos.IsPurchase = 0;
                 pos.ActivationState = 1;