#[3799] Calculate orderDiscountedPrice according to the new formula (#…

…644) * #[3799] Calculate orderDiscountedPrice according to the new formula * #[3799] fix
ita-social-projects · Jan 28, 2022 · 6fbc1fb · 6fbc1fb
1 parent 34643d8
commit 6fbc1fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lombok.config b/lombok.config
@@ -1 +1,2 @@
-lombok.addLombokGeneratedAnnotation = true
+lombok.addLombokGeneratedAnnotation = true
+lombok.accessors.chain = true
diff --git a/service/src/main/java/greencity/service/ubs/UBSManagementServiceImpl.java b/service/src/main/java/greencity/service/ubs/UBSManagementServiceImpl.java
@@ -407,8 +407,7 @@ public OrderStatusPageDto getOrderStatusData(Long orderId, String languageCode)
             .addressExportDetailsDto(addressDtoForAdminPage)
             .addressComment(address.getAddressComment()).bags(bagInfo)
             .orderFullPrice(prices.getSumAmount())
-            .orderDiscountedPrice(getPaymentInfo(orderId, prices.getSumAmount().longValue()).getOverpayment() > 0 ? 0
-                : prices.getTotalSumAmount())
+            .orderDiscountedPrice(getPaymentInfo(orderId, prices.getSumAmount().longValue()).getUnPaidAmount())
             .orderBonusDiscount(prices.getBonus()).orderCertificateTotalDiscount(prices.getCertificateBonus())
             .orderExportedPrice(prices.getSumExported()).orderExportedDiscountedPrice(prices.getTotalSumExported())
             .amountOfBagsOrdered(order.map(Order::getAmountOfBagsOrdered).orElse(null))