Fix owner payment calculation with benefits (#2238)

Author: wling-art

quickshop-bukkit/src/main/java/com/ghostchu/quickshop/economy/transaction/QSEconomyTransaction.java

@@ -68,6 +68,8 @@ public class QSEconomyTransaction implements EconomyTransaction {
   private @Nullable QUser to;
   private @Nullable QUser taxer;
 
+  private @NotNull BigDecimal ownerPayment;
+
   private String lastError = "No transaction error logged";
 
   public QSEconomyTransaction(final BenefitProvider benefitManager, @NotNull final String world,
@@ -274,6 +276,16 @@ public String lastError() {
     return lastError;
   }
 
+  /**
+   * Retrieves the amount the owner actually receives after benefits and tax deductions.
+   *
+   * @return a BigDecimal value representing the owner payment amount
+   */
+  public @NotNull BigDecimal ownerPayment() {
+
+    return ownerPayment;
+  }
+
   /**
    * Indicates whether the transaction is completable.
    *
@@ -354,6 +366,7 @@ public boolean commit(@NotNull final TransactionCallback callback) {
     //if there's no benefits
     if(benefitProvider.none()) {
 
+      this.ownerPayment = amountAfterTax;
       if(to != null && !this.executeOperation(new EconomyDepositOperation(to, amountAfterTax, world, currency))) {
 
         this.lastError = "Failed to deposit " + amountAfterTax.toPlainString() + " to account " + to + "LastError: " + provider.lastError();
@@ -386,9 +399,9 @@ public boolean commit(@NotNull final TransactionCallback callback) {
     }
 
 
-    final BigDecimal ownerPayment = CalculateUtil.multiply(amountAfterTax, fullAmount.subtract(payout));
+    this.ownerPayment = CalculateUtil.multiply(amountAfterTax, fullAmount.subtract(payout));
     Log.transaction("Benefit for owner remaining: " + ownerPayment.toPlainString());
-    if(ownerPayment.compareTo(BigDecimal.ZERO) > 0 && !this.executeOperation(new EconomyWithdrawOperation(to, ownerPayment, world, currency))) {
+    if(ownerPayment.compareTo(BigDecimal.ZERO) > 0 && !this.executeOperation(new EconomyDepositOperation(to, ownerPayment, world, currency))) {
 
       this.lastError = "Failed to deposit " + ownerPayment.toPlainString() + " to account " + to + "LastError: " + provider.lastError();
       callback.onFailed(this);
@@ -496,4 +509,4 @@ private boolean executeOperation(@NotNull final Operation operation) {
       return false;
     }
   }
-}
+}

quickshop-bukkit/src/main/java/com/ghostchu/quickshop/shop/SimpleShopManager.java

@@ -591,7 +591,7 @@ public boolean actionSelling(@NotNull final Player seller, @NotNull final Invent
     }
     sendPurchaseSuccess(sellerQUser, shop, amount, total, transaction.tax().doubleValue());
     new ShopSuccessPurchaseEvent(shop, sellerQUser, sellerInventory, amount, total, transaction.tax().doubleValue()).callEvent();
-    notifyBought(sellerQUser, shop, amount, stock, transaction.tax().doubleValue(), total);
+    notifyBought(sellerQUser, shop, amount, stock, transaction);
     return true;
   }
 
@@ -1124,16 +1124,18 @@ public void sendShopInfo(@NotNull final Player p, @NotNull final Shop shop) {
   }
 
 
-  private void notifyBought(@NotNull final QUser seller, @NotNull final Shop shop, final int amount, final int stock, final double tax, final double total) {
+  private void notifyBought(@NotNull final QUser seller, @NotNull final Shop shop, final int amount, final int stock, @NotNull final QSEconomyTransaction transaction) {
 
     Util.asyncThreadRun(()->{
       final String langCode = plugin.text().findRelativeLanguages(shop.getOwner(), true).getLocale();
       final List<Component> sendList = new ArrayList<>();
       Component notify;
+      final double ownerPayment = transaction.ownerPayment().doubleValue();
+      final double tax = transaction.tax().doubleValue();
       if(plugin.getConfig().getBoolean("show-tax")) {
-        notify = plugin.text().of("player-bought-from-your-store-tax", seller, amount * shop.getItem().getAmount(), Util.getItemStackName(shop.getItem()), this.formatter.format(total - tax, shop), this.formatter.format(tax, shop)).forLocale(langCode);
+        notify = plugin.text().of("player-bought-from-your-store-tax", seller, amount * shop.getItem().getAmount(), Util.getItemStackName(shop.getItem()), this.formatter.format(ownerPayment, shop), this.formatter.format(tax, shop)).forLocale(langCode);
       } else {
-        notify = plugin.text().of("player-bought-from-your-store", seller, amount * shop.getItem().getAmount(), Util.getItemStackName(shop.getItem()), this.formatter.format(total - tax, shop)).forLocale(langCode);
+        notify = plugin.text().of("player-bought-from-your-store", seller, amount * shop.getItem().getAmount(), Util.getItemStackName(shop.getItem()), this.formatter.format(ownerPayment, shop)).forLocale(langCode);
       }
       notify = plugin.platform().setItemStackHoverEvent(notify, shop.getItem());
       sendList.add(notify);