|
|
@@ -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;
|
|
|
}
|