|
|
@@ -194,7 +194,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "10").Sum(m => m.TradeAmount);
|
|
|
}
|
|
|
- else if (pos.BrandId == 12)
|
|
|
+ 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);
|
|
|
}
|
|
|
@@ -450,7 +450,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "10").Sum(m => m.TradeAmount);
|
|
|
}
|
|
|
- else if (pos.BrandId == 12)
|
|
|
+ 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);
|
|
|
}
|
|
|
@@ -689,7 +689,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "10").Sum(m => m.TradeAmount);
|
|
|
}
|
|
|
- else if (pos.BrandId == 12)
|
|
|
+ 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);
|
|
|
}
|
|
|
@@ -936,7 +936,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
prizes.Add(50);
|
|
|
}
|
|
|
- else if (pos.BrandId == 12 && pos.IsFirst == 1 && ActPrize == 0) //盒易付首台无押金机返50
|
|
|
+ else if ((pos.BrandId == 12 || pos.BrandId == 13) && pos.IsFirst == 1 && ActPrize == 0) //盒易付首台无押金机返50
|
|
|
{
|
|
|
prizes.Add(50);
|
|
|
}
|