ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

ge: include both delta qty and qty

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java
View File

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

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

4
http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeService.java
View File

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

3
http-service/src/main/java/net/runelite/http/service/ge/Trade.java
View File

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

6
runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
View File

@@ -412,7 +412,6 @@ public class GrandExchangePlugin extends Plugin
GrandExchangeTrade grandExchangeTrade = new GrandExchangeTrade(); GrandExchangeTrade grandExchangeTrade = new GrandExchangeTrade();
grandExchangeTrade.setBuy(state == GrandExchangeOfferState.BUYING); grandExchangeTrade.setBuy(state == GrandExchangeOfferState.BUYING);
grandExchangeTrade.setItemId(offer.getItemId()); grandExchangeTrade.setItemId(offer.getItemId());
grandExchangeTrade.setQuantity(0);
grandExchangeTrade.setTotal(offer.getTotalQuantity()); grandExchangeTrade.setTotal(offer.getTotalQuantity());
grandExchangeTrade.setSpent(0); grandExchangeTrade.setSpent(0);
grandExchangeTrade.setOffer(offer.getPrice()); grandExchangeTrade.setOffer(offer.getPrice());
@@ -443,7 +442,7 @@ public class GrandExchangePlugin extends Plugin
grandExchangeTrade.setBuy(state == GrandExchangeOfferState.CANCELLED_BUY); grandExchangeTrade.setBuy(state == GrandExchangeOfferState.CANCELLED_BUY);
grandExchangeTrade.setCancel(true); grandExchangeTrade.setCancel(true);
grandExchangeTrade.setItemId(offer.getItemId()); grandExchangeTrade.setItemId(offer.getItemId());
grandExchangeTrade.setQuantity(offer.getQuantitySold()); grandExchangeTrade.setQty(offer.getQuantitySold());
grandExchangeTrade.setTotal(offer.getTotalQuantity()); grandExchangeTrade.setTotal(offer.getTotalQuantity());
grandExchangeTrade.setSpent(offer.getSpent()); grandExchangeTrade.setSpent(offer.getSpent());
grandExchangeTrade.setOffer(offer.getPrice()); grandExchangeTrade.setOffer(offer.getPrice());
@@ -466,7 +465,8 @@ public class GrandExchangePlugin extends Plugin
GrandExchangeTrade grandExchangeTrade = new GrandExchangeTrade(); GrandExchangeTrade grandExchangeTrade = new GrandExchangeTrade();
grandExchangeTrade.setBuy(state == GrandExchangeOfferState.BUYING); grandExchangeTrade.setBuy(state == GrandExchangeOfferState.BUYING);
grandExchangeTrade.setItemId(offer.getItemId()); grandExchangeTrade.setItemId(offer.getItemId());
grandExchangeTrade.setQuantity(qty); grandExchangeTrade.setQty(offer.getQuantitySold());
grandExchangeTrade.setDqty(qty);
grandExchangeTrade.setTotal(offer.getTotalQuantity()); grandExchangeTrade.setTotal(offer.getTotalQuantity());
grandExchangeTrade.setSpent(dspent); grandExchangeTrade.setSpent(dspent);
grandExchangeTrade.setOffer(offer.getPrice()); grandExchangeTrade.setOffer(offer.getPrice());

4
runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java
View File

@@ -157,7 +157,7 @@ public class GrandExchangePluginTest
GrandExchangeTrade trade = captor.getValue(); GrandExchangeTrade trade = captor.getValue();
assertTrue(trade.isBuy()); assertTrue(trade.isBuy());
assertEquals(ItemID.ABYSSAL_WHIP, trade.getItemId()); assertEquals(ItemID.ABYSSAL_WHIP, trade.getItemId());
assertEquals(2, trade.getQuantity()); assertEquals(2, trade.getDqty());
assertEquals(10, trade.getTotal()); assertEquals(10, trade.getTotal());
assertEquals(20, trade.getSpent()); assertEquals(20, trade.getSpent());
} }
@@ -214,7 +214,7 @@ public class GrandExchangePluginTest
assertTrue(trade.isBuy()); assertTrue(trade.isBuy());
assertTrue(trade.isCancel()); assertTrue(trade.isCancel());
assertEquals(ItemID.ABYSSAL_WHIP, trade.getItemId()); assertEquals(ItemID.ABYSSAL_WHIP, trade.getItemId());
assertEquals(1, trade.getQuantity()); assertEquals(1, trade.getQty());
assertEquals(10, trade.getTotal()); assertEquals(10, trade.getTotal());
assertEquals(25, trade.getSpent()); assertEquals(25, trade.getSpent());
} }