diff --git a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java index 3e886b68cb..0ab9260f7f 100644 --- a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java +++ b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java @@ -38,6 +38,7 @@ public class GrandExchangeTrade private int dqty; private int total; private int spent; + private int dspent; private int offer; private int slot; private WorldType worldType; diff --git a/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java b/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java index ad03083739..c6eaf85b15 100644 --- a/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java +++ b/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java @@ -94,7 +94,7 @@ public class GrandExchangeController trade.setQty(grandExchangeTrade.getQty()); trade.setDqty(grandExchangeTrade.getDqty()); trade.setTotal(grandExchangeTrade.getTotal()); - trade.setSpent(grandExchangeTrade.getSpent()); + trade.setSpent(grandExchangeTrade.getDspent()); trade.setOffer(grandExchangeTrade.getOffer()); trade.setSlot(grandExchangeTrade.getSlot()); trade.setTime((int) (System.currentTimeMillis() / 1000L)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java index 9de2574fc7..02972dd772 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java @@ -420,7 +420,6 @@ public class GrandExchangePlugin extends Plugin grandExchangeTrade.setBuy(state == GrandExchangeOfferState.BUYING); grandExchangeTrade.setItemId(offer.getItemId()); grandExchangeTrade.setTotal(offer.getTotalQuantity()); - grandExchangeTrade.setSpent(0); grandExchangeTrade.setOffer(offer.getPrice()); grandExchangeTrade.setSlot(slot); grandExchangeTrade.setWorldType(getGeWorldType()); @@ -475,7 +474,8 @@ public class GrandExchangePlugin extends Plugin grandExchangeTrade.setQty(offer.getQuantitySold()); grandExchangeTrade.setDqty(qty); grandExchangeTrade.setTotal(offer.getTotalQuantity()); - grandExchangeTrade.setSpent(dspent); + grandExchangeTrade.setDspent(dspent); + grandExchangeTrade.setSpent(offer.getSpent()); grandExchangeTrade.setOffer(offer.getPrice()); grandExchangeTrade.setSlot(slot); grandExchangeTrade.setWorldType(getGeWorldType()); diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java index 1f7e4d1993..0c3dc00d04 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java @@ -135,6 +135,7 @@ public class GrandExchangePluginTest @Test public void testSubmitTrade() { + // 1 @ 25 SavedOffer savedOffer = new SavedOffer(); savedOffer.setItemId(ItemID.ABYSSAL_WHIP); savedOffer.setQuantitySold(1); @@ -162,7 +163,8 @@ public class GrandExchangePluginTest assertEquals(ItemID.ABYSSAL_WHIP, trade.getItemId()); assertEquals(2, trade.getDqty()); assertEquals(10, trade.getTotal()); - assertEquals(20, trade.getSpent()); + assertEquals(45, trade.getSpent()); + assertEquals(20, trade.getDspent()); } @Test