ge: include both delta qty and qty

This commit is contained in:
Adam
2020-06-04 10:01:11 -04:00
parent 6f8b3260a0
commit 2dd6fa41e9
6 changed files with 15 additions and 12 deletions

View File

@@ -80,8 +80,8 @@ public class GrandExchangeController
// We don't keep track of pending trades in the web UI, so only add cancelled or completed trades
if (userId != null &&
grandExchangeTrade.getQuantity() > 0 &&
(grandExchangeTrade.isCancel() || grandExchangeTrade.getQuantity() == grandExchangeTrade.getTotal()))
grandExchangeTrade.getQty() > 0 &&
(grandExchangeTrade.isCancel() || grandExchangeTrade.getQty() == grandExchangeTrade.getTotal()))
{
grandExchangeService.add(userId, grandExchangeTrade);
}
@@ -91,7 +91,8 @@ public class GrandExchangeController
trade.setCancel(grandExchangeTrade.isCancel());
trade.setLogin(grandExchangeTrade.isLogin());
trade.setItemId(grandExchangeTrade.getItemId());
trade.setQuantity(grandExchangeTrade.getQuantity());
trade.setQty(grandExchangeTrade.getQty());
trade.setDqty(grandExchangeTrade.getDqty());
trade.setTotal(grandExchangeTrade.getTotal());
trade.setSpent(grandExchangeTrade.getSpent());
trade.setOffer(grandExchangeTrade.getOffer());

View File

@@ -79,8 +79,8 @@ public class GrandExchangeService
.addParameter("user", userId)
.addParameter("action", grandExchangeTrade.isBuy() ? "BUY" : "SELL")
.addParameter("item", grandExchangeTrade.getItemId())
.addParameter("quantity", grandExchangeTrade.getQuantity())
.addParameter("price", grandExchangeTrade.getSpent() / grandExchangeTrade.getQuantity())
.addParameter("quantity", grandExchangeTrade.getQty())
.addParameter("price", grandExchangeTrade.getSpent() / grandExchangeTrade.getQty())
.executeUpdate();
}
}

View File

@@ -34,7 +34,8 @@ class Trade
private boolean cancel;
private boolean login;
private int itemId;
private int quantity;
private int qty;
private int dqty;
private int total;
private int spent;
private int offer;