invoice: CR for PR #868

killbill · Feb 14, 2018 · 975cc1e · 975cc1e
1 parent 3fc2275
commit 975cc1e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...in/java/org/killbill/billing/invoice/usage/ContiguousIntervalConsumableUsageInArrear.java b/...in/java/org/killbill/billing/invoice/usage/ContiguousIntervalConsumableUsageInArrear.java
@@ -136,7 +136,7 @@ List<UsageConsumableInArrearTierUnitDetail> getBilledDetailsForUnitType(final It
                         resultMap.put(curDetail.getTier(), curDetail);
                     } else {
                         final UsageConsumableInArrearTierUnitDetail perTierDetail = resultMap.get(curDetail.getTier());
-                        perTierDetail.updateQuantityAndAmount(perTierDetail.getQuantity() + curDetail.getQuantity());
+                        perTierDetail.updateQuantityAndAmount(curDetail.getQuantity());
                     }
                 }
             }

diff --git a/...ava/org/killbill/billing/invoice/usage/details/UsageConsumableInArrearTierUnitDetail.java b/...ava/org/killbill/billing/invoice/usage/details/UsageConsumableInArrearTierUnitDetail.java
@@ -71,12 +71,12 @@ public int getTierBlockSize() {
         return tierBlockSize;
     }
 
-    public void updateQuantityAndAmount(final Integer targetQuantity) {
+    public void updateQuantityAndAmount(final Integer addionalQuantity) {
-        this.quantity = targetQuantity;
+        this.quantity = quantity + addionalQuantity;
-        this.amount = computeAmount(tierPrice, targetQuantity);
+        this.amount = computeAmount(tierPrice, quantity);
     }
 
     private static BigDecimal computeAmount(final BigDecimal targetTierPrice, final Integer targetQuantity) {
-        return targetTierPrice.multiply(new BigDecimal(targetQuantity));
+        return targetTierPrice.multiply(BigDecimal.valueOf(targetQuantity));
     }
 }