fix bug

LUOXC
Commit 961c8b4bc3ee9340e4aaf44b26c7e5642ef182cf 1 parent f67099e7
Showing 1 changed file with 8 additions and 2 deletions
order/src/main/java/com/yohoufo/order/service/handler/BuyerCancelCompensateComputeHandler.java
--- a/order/src/main/java/com/yohoufo/order/service/handler/BuyerCancelCompensateComputeHandler.java
View file @961c8b4
+++ b/order/src/main/java/com/yohoufo/order/service/handler/BuyerCancelCompensateComputeHandler.java
View file @961c8b4
@@ -93,12 +93,18 @@ public class BuyerCancelCompensateComputeHandler {
         if (Objects.nonNull(penaltyRule.getPenaltyMinAmount()) && penaltyAmount.compareTo(penaltyRule.getPenaltyMinAmount()) < 0) {
             penaltyAmount = penaltyRule.getPenaltyMinAmount();
         }
+         if (Objects.nonNull(penaltyRule.getPenaltyMaxAmount()) && penaltyAmount.compareTo(penaltyRule.getPenaltyMaxAmount()) > 0) {
+             penaltyAmount = penaltyRule.getPenaltyMaxAmount();
+         }
         BigDecimal leftAmount = orderActualAmount.subtract(penaltyAmount);
-         BuyerPenaltyCalResult bpcr = BuyerPenaltyCalResult.builder().uid(buyerUid).orderCode(orderCode)
+         BuyerPenaltyCalResult bpcr = BuyerPenaltyCalResult.builder()
+                 .uid(buyerUid).orderCode(orderCode)
                 .orderActualAmount(orderActualAmount)
                 .goodsActualAmount(goodsActualAmount)
                 .penaltyRate(penaltyRate)
-                 .penaltyAmount(penaltyAmount).leftAmount(leftAmount).build();
+                 .penaltyAmount(penaltyAmount)
+                 .leftAmount(leftAmount)
+                 .build();
         logger.info("calBuyerPenalty mfee {} BuyerPenaltyCalResult {}", penaltyRule, bpcr);
         return bpcr;
     }