diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
index d4d6cf1cf..b4a538567 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
@@ -421,7 +421,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
                 if (activeDiscountPayVO.getOilId().contains(paymentActiveDTO.getOilId().toString()) &&
                     activeDiscountPayVO.getAdaptUser().contains(paymentActiveDTO.getMtUserLevel().toString())){
                     if (activeDiscountPayVO.getAmount().multiply(activeDiscountPayVO.getDiscount()).compareTo(amount) > 0){
-                        amount = paymentActiveDTO.getAmount().subtract(((b.subtract(activeDiscountPayVO.getDiscount())).multiply(activeDiscountPayVO.getAmount()).multiply(a)));
+                        amount = paymentActiveDTO.getAmount().subtract(((b.subtract(activeDiscountPayVO.getDiscount())).multiply(paymentActiveDTO.getAmount()).multiply(a)));
                         paymentActiveVO.setActiveId(activeDiscountPayVO.getActiveId());
                         paymentActiveVO.setAmount(amount);
                         paymentActiveVO.setFavorableAmount((b.subtract(activeDiscountPayVO.getDiscount())).multiply(activeDiscountPayVO.getAmount()).multiply(a));
@@ -439,10 +439,10 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
                     if ((paymentActiveDTO.getAmount()).compareTo(activeDiscountPayVO.getAmount()) >= 0){
                         fullAmount = paymentActiveDTO.getAmount().subtract(activeDiscountPayVO.getDiscount());
                     if (amount.compareTo(fullAmount) > 0){
-                        amount = paymentActiveDTO.getAmount().subtract(fullAmount);
+                        amount = paymentActiveDTO.getAmount().subtract(activeDiscountPayVO.getDiscount());
                         paymentActiveVO.setActiveId(activeDiscountPayVO.getActiveId());
                         paymentActiveVO.setAmount(amount);
-                        paymentActiveVO.setFavorableAmount(paymentActiveDTO.getAmount().subtract(activeDiscountPayVO.getDiscount()));
+                        paymentActiveVO.setFavorableAmount(paymentActiveDTO.getAmount().subtract(fullAmount));
                     }
                     }
                 }