|
@@ -56,10 +56,10 @@ namespace MySystem
|
|
|
}
|
|
|
if(pos.BrandId == 23 || pos.BrandId == 24 || pos.BrandId == 25 || pos.BrandId == 26)
|
|
|
{
|
|
|
- PxcModels.WifiTradeRecord trade = db.WifiTradeRecord.FirstOrDefault(m => m.SnNo == pos.PosSn);
|
|
|
- if (trade != null)
|
|
|
+ int tradeCount = db.WifiTradeRecord.Count(m => m.SnNo == pos.PosSn);
|
|
|
+ if (tradeCount > 0)
|
|
|
{
|
|
|
- ChangeAmount = trade.TradeAmount * 0.015M;
|
|
|
+ ChangeAmount = db.WifiTradeRecord.Where(m => m.SnNo == pos.PosSn).OrderByDescending(m => m.Id).TradeAmount * 0.015M;
|
|
|
ChangeAmount = PublicFunction.NumberFormat(ChangeAmount);
|
|
|
}
|
|
|
else
|