|
@@ -134,14 +134,13 @@ namespace MySystem
|
|
|
}
|
|
|
PosPushDataNewHelper.Trade(trade);
|
|
|
}
|
|
|
-
|
|
|
- TradeRecord edit = spdb.TradeRecord.FirstOrDefault(m => m.Id == trade.Id);
|
|
|
- if (edit != null)
|
|
|
- {
|
|
|
- edit.Status = 2;
|
|
|
- }
|
|
|
- spdb.SaveChanges();
|
|
|
}
|
|
|
+ TradeRecord edit = spdb.TradeRecord.FirstOrDefault(m => m.Id == trade.Id);
|
|
|
+ if (edit != null)
|
|
|
+ {
|
|
|
+ edit.Status = 2;
|
|
|
+ }
|
|
|
+ spdb.SaveChanges();
|
|
|
}
|
|
|
spdb.Dispose();
|
|
|
db.Dispose();
|
|
@@ -174,18 +173,14 @@ namespace MySystem
|
|
|
IQueryable<TradeRecord> trades = spdb.TradeRecord.Where(m => m.Id >= StartId && m.ProductType == "14" && m.CreateDate >= start && m.Status == 1).OrderBy(m => m.CreateDate).Take(20);
|
|
|
foreach (TradeRecord trade in trades.ToList())
|
|
|
{
|
|
|
- bool op = true;
|
|
|
- if (op)
|
|
|
+ PosPushDataNewHelper.Trade(trade);
|
|
|
+
|
|
|
+ TradeRecord edit = spdb.TradeRecord.FirstOrDefault(m => m.Id == trade.Id);
|
|
|
+ if (edit != null)
|
|
|
{
|
|
|
- PosPushDataNewHelper.Trade(trade);
|
|
|
-
|
|
|
- TradeRecord edit = spdb.TradeRecord.FirstOrDefault(m => m.Id == trade.Id);
|
|
|
- if (edit != null)
|
|
|
- {
|
|
|
- edit.Status = 2;
|
|
|
- }
|
|
|
- spdb.SaveChanges();
|
|
|
+ edit.Status = 2;
|
|
|
}
|
|
|
+ spdb.SaveChanges();
|
|
|
}
|
|
|
spdb.Dispose();
|
|
|
db.Dispose();
|