lichunlei 4 лет назад
Родитель
Сommit
f9e2e2de8b

+ 1 - 1
AppStart/Helper/SycnSpTradeService.cs

@@ -108,7 +108,7 @@ namespace MySystem
                                     }
                                     if (trade.TradeType == "CLOUD_PAY") QrPayFlag = 1;
                                 }
-                                else if (pos.BrandId == 4 || pos.BrandId == 5)
+                                else if (pos.BrandId == 4 || pos.BrandId == 5 || pos.BrandId == 8 || pos.BrandId == 9)
                                 {
                                     TradeAmount = TradeAmount / 100;
                                     if (trade.BankCardType == "100")

+ 3 - 3
Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -161,7 +161,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     CreditTrade = spdb.TradeRecord.Where(m => 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)
+                else if (pos.BrandId == 4 || pos.BrandId == 5 || pos.BrandId == 8 || pos.BrandId == 9)
                 {
                     CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "4").Sum(m => m.TradeAmount) / 100;
                 }
@@ -394,7 +394,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     CreditTrade = spdb.TradeRecord.Where(m => 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)
+                else if (pos.BrandId == 4 || pos.BrandId == 5 || pos.BrandId == 8 || pos.BrandId == 9)
                 {
                     CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "4").Sum(m => m.TradeAmount) / 100;
                 }
@@ -586,7 +586,7 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                         List<decimal> prizes = new List<decimal>();
                         decimal ActPrize = decimal.Parse(function.CheckNum(pos.SeoKeyword));
-                        if (pos.BrandId == 1 || pos.BrandId == 3 || pos.BrandId == 4 || pos.BrandId == 5 || pos.BrandId == 6)
+                        if (pos.BrandId == 1 || pos.BrandId == 3 || pos.BrandId == 4 || pos.BrandId == 5 || pos.BrandId == 6 || pos.BrandId == 8 || pos.BrandId == 9)
                         {
                             ActPrize = ActPrize / 100;
                         }